@das-fed/ui 6.4.0-hot.7 → 6.4.0-hot.8

package/packages/components/form/index.d.ts

@@ -48,6 +48,10 @@ declare const DasForm: import("@das-fed/utils").SFCWithInstall<{
             type: import("vue").PropType<"default" | "overlay">;
             default: string;
         };
+        autoMarginRight: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
     }>>, {
         validate: (callback: any) => Promise<void>;
         validateField: (prop: string, callback: any) => Promise<void>;
@@ -100,6 +104,10 @@ declare const DasForm: import("@das-fed/utils").SFCWithInstall<{
             type: import("vue").PropType<"default" | "overlay">;
             default: string;
         };
+        autoMarginRight: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
     }>>, {
         alignItems: string;
         marginBottom: string;
@@ -112,6 +120,7 @@ declare const DasForm: import("@das-fed/utils").SFCWithInstall<{
         labelMarginRight: string;
         isSearchForm: boolean;
         errorMode: "default" | "overlay";
+        autoMarginRight: boolean;
     }, true, {}, {}, {
         P: {};
         B: {};
@@ -167,6 +176,10 @@ declare const DasForm: import("@das-fed/utils").SFCWithInstall<{
             type: import("vue").PropType<"default" | "overlay">;
             default: string;
         };
+        autoMarginRight: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
     }>>, {
         validate: (callback: any) => Promise<void>;
         validateField: (prop: string, callback: any) => Promise<void>;
@@ -183,6 +196,7 @@ declare const DasForm: import("@das-fed/utils").SFCWithInstall<{
         labelMarginRight: string;
         isSearchForm: boolean;
         errorMode: "default" | "overlay";
+        autoMarginRight: boolean;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -235,6 +249,10 @@ declare const DasForm: import("@das-fed/utils").SFCWithInstall<{
         type: import("vue").PropType<"default" | "overlay">;
         default: string;
     };
+    autoMarginRight: {
+        type: import("vue").PropType<boolean>;
+        default: boolean;
+    };
 }>>, {
     validate: (callback: any) => Promise<void>;
     validateField: (prop: string, callback: any) => Promise<void>;
@@ -251,6 +269,7 @@ declare const DasForm: import("@das-fed/utils").SFCWithInstall<{
     labelMarginRight: string;
     isSearchForm: boolean;
     errorMode: "default" | "overlay";
+    autoMarginRight: boolean;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
     $slots: {
         default?(_: {}): any;
@@ -271,6 +290,7 @@ declare const DasFormRef: () => import("vue").Ref<({
         labelMarginRight: string;
         isSearchForm: boolean;
         errorMode: "default" | "overlay";
+        autoMarginRight: boolean;
     }> & Omit<{
         readonly alignItems: string;
         readonly marginBottom: string;
@@ -283,6 +303,7 @@ declare const DasFormRef: () => import("vue").Ref<({
         readonly labelMarginRight: string;
         readonly isSearchForm: boolean;
         readonly errorMode: "default" | "overlay";
+        readonly autoMarginRight: boolean;
         readonly cols?: number;
     } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         alignItems: {
@@ -332,7 +353,11 @@ declare const DasFormRef: () => import("vue").Ref<({
             type: import("vue").PropType<"default" | "overlay">;
             default: string;
         };
-    }>>, "alignItems" | "marginBottom" | "marginRight" | "labelLength" | "contentWidth" | "labelPosition" | "alignType" | "rules" | "labelMarginRight" | "isSearchForm" | "errorMode">;
+        autoMarginRight: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
+    }>>, "alignItems" | "marginBottom" | "marginRight" | "labelLength" | "contentWidth" | "labelPosition" | "alignType" | "rules" | "labelMarginRight" | "isSearchForm" | "errorMode" | "autoMarginRight">;
     $attrs: {
         [x: string]: unknown;
     };
@@ -394,6 +419,10 @@ declare const DasFormRef: () => import("vue").Ref<({
             type: import("vue").PropType<"default" | "overlay">;
             default: string;
         };
+        autoMarginRight: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
     }>>, {
         validate: (callback: any) => Promise<void>;
         validateField: (prop: string, callback: any) => Promise<void>;
@@ -410,6 +439,7 @@ declare const DasFormRef: () => import("vue").Ref<({
         labelMarginRight: string;
         isSearchForm: boolean;
         errorMode: "default" | "overlay";
+        autoMarginRight: boolean;
     }, {}, string, {}> & {
         beforeCreate?: (() => void) | (() => void)[];
         created?: (() => void) | (() => void)[];
@@ -478,6 +508,10 @@ declare const DasFormRef: () => import("vue").Ref<({
         type: import("vue").PropType<"default" | "overlay">;
         default: string;
     };
+    autoMarginRight: {
+        type: import("vue").PropType<boolean>;
+        default: boolean;
+    };
 }>>, "validate" | "validateField" | "resetField"> & import("vue").ShallowUnwrapRef<{
     validate: (callback: any) => Promise<void>;
     validateField: (prop: string, callback: any) => Promise<void>;

package/packages/components/form/index.js

@@ -1,8 +1,11 @@
 import '@das-fed/ui/packages/components/form/style.css';
-import { defineComponent as p, provide as u, reactive as v, openBlock as g, createElementBlock as h, normalizeClass as F, normalizeStyle as y, renderSlot as _, ref as x } from "vue";
-import { withInstall as I } from "@das-fed/utils/with-install/index";
+import { defineComponent as M, ref as y, useSlots as N, watch as k, nextTick as S, provide as b, reactive as w, onMounted as z, openBlock as B, createElementBlock as C, normalizeClass as E, normalizeStyle as T, renderSlot as D } from "vue";
+import { withInstall as $ } from "@das-fed/utils/with-install/index";
 import "@das-fed/ui/packages/global/theme";
-const S = /* @__PURE__ */ p({
+const v = (l, n = "children") => Array.isArray(l) && l.length ? l.reduce((t, s) => {
+  let a = s[n], i = { ...s };
+  return delete i[n], a && a.length ? t.concat(v(a, n)) : typeof i.type == "object" && i.props ? t.concat(i) : t;
+}, []) : [], P = /* @__PURE__ */ M({
   __name: "Index",
   props: {
     labelLength: { default: 4 },
@@ -16,51 +19,84 @@ const S = /* @__PURE__ */ p({
     rules: { default: {} },
     labelMarginRight: { default: "30px" },
     isSearchForm: { type: Boolean, default: !1 },
-    errorMode: { default: "default" }
+    errorMode: { default: "default" },
+    autoMarginRight: { type: Boolean, default: !1 }
   },
-  setup(l, { expose: r }) {
-    const o = l;
-    let a = [];
-    u("DasForm", v({ props: o, addField: (e) => {
-      a.push(e);
+  setup(l, { expose: n }) {
+    const t = l, s = y(), a = N(), i = () => {
+      const e = a.default(), o = ["#comment", "#text"], d = Array.from(s.value.childNodes).filter(
+        (m) => !o.includes(m.nodeName)
+      ), f = t.cols || 4;
+      let r = 0;
+      v(e).forEach((m, x) => {
+        const p = m.props, g = p.col ?? 1;
+        r += g;
+        const h = d[x];
+        if (r === f)
+          h.style.marginRight = "0px";
+        else {
+          const A = p.marginRight;
+          h.style.marginRight = A || t.marginRight;
+        }
+        r === f ? r = 0 : r > f && (r = g);
+      });
+    };
+    k(
+      () => a.default(),
+      (e) => {
+        S(() => {
+          u();
+        });
+      },
+      {
+        deep: !0
+      }
+    );
+    let c = [];
+    b("DasForm", w({ props: t, addField: (e) => {
+      c.push(e);
     }, removeField: (e) => {
-      a = a.filter((t) => t.timeStamp !== e.timeStamp);
+      c = c.filter((o) => o.timeStamp !== e.timeStamp);
     } }));
-    const i = async (e) => {
-      const t = await f();
-      e(t);
-    }, d = async (e, t) => {
-      const m = await a.find((n) => n.propName === e && n.rules.length > 0).validate();
-      t(m);
-    }, f = async () => {
+    const F = async (e) => {
+      const o = await I();
+      e(o);
+    }, R = async (e, o) => {
+      const f = await c.find((r) => r.propName === e && r.rules.length > 0).validate();
+      o(f);
+    }, I = async () => {
       let e = !0;
-      for (const t of a)
-        t.propName && t.rules.length > 0 && (await t.validate() || (e = !1));
+      for (const o of c)
+        o.propName && o.rules.length > 0 && (await o.validate() || (e = !1));
       return e;
+    }, _ = () => {
+      c.forEach((e) => {
+        e.resetError();
+      });
+    }, u = () => {
+      t.autoMarginRight && t.alignType === "horizontal" && i();
     };
-    return r({
-      validate: i,
-      validateField: d,
-      resetField: () => {
-        a.forEach((e) => {
-          e.resetError();
-        });
-      }
-    }), (e, t) => (g(), h("div", {
-      class: F(["das-ui-form", { horizontal: e.alignType === "horizontal" }]),
-      style: y({ alignItems: e.alignItems })
+    return z(u), n({
+      validate: F,
+      validateField: R,
+      resetField: _
+    }), (e, o) => (B(), C("div", {
+      class: E(["das-ui-form", { horizontal: e.alignType === "horizontal" }]),
+      ref_key: "$formRef",
+      ref: s,
+      style: T({ alignItems: e.alignItems })
     }, [
-      _(e.$slots, "default", {}, void 0, !0)
+      D(e.$slots, "default", {}, void 0, !0)
     ], 6));
   }
-}), b = (l, r) => {
-  const o = l.__vccOpts || l;
-  for (const [a, s] of r)
-    o[a] = s;
-  return o;
-}, w = /* @__PURE__ */ b(S, [["__scopeId", "data-v-7f30b002"]]), R = I(w), C = () => x(null);
+}), j = (l, n) => {
+  const t = l.__vccOpts || l;
+  for (const [s, a] of n)
+    t[s] = a;
+  return t;
+}, L = /* @__PURE__ */ j(P, [["__scopeId", "data-v-45483b0c"]]), K = $(L), Q = () => y(null);
 export {
-  R as DasForm,
-  C as DasFormRef,
-  R as default
+  K as DasForm,
+  Q as DasFormRef,
+  K as default
 };

package/packages/components/form/src/Index.vue.d.ts

@@ -14,6 +14,7 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_WithDefaults<
     labelMarginRight: string;
     errorMode: string;
     isSearchForm: boolean;
+    autoMarginRight: boolean;
 }>, {
     validate: (callback: any) => Promise<void>;
     validateField: (prop: string, callback: any) => Promise<void>;
@@ -30,6 +31,7 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_WithDefaults<
     labelMarginRight: string;
     errorMode: string;
     isSearchForm: boolean;
+    autoMarginRight: boolean;
 }>>>, {
     alignItems: string;
     marginBottom: string;
@@ -42,6 +44,7 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_WithDefaults<
     labelMarginRight: string;
     isSearchForm: boolean;
     errorMode: "default" | "overlay";
+    autoMarginRight: boolean;
 }, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/packages/components/form/src/type.d.ts

@@ -34,4 +34,7 @@ export interface Props {
 
   
   errorMode?: 'default' | 'overlay'
+
+  
+  autoMarginRight?: boolean
 }

package/packages/components/form/src/utils/flat-form-item.d.ts

@@ -0,0 +1 @@
+export declare const flatFormItem: (list: any[], child?: string) => any[];

package/packages/components/form/style.css

@@ -1 +1 @@
-.das-ui-form[data-v-7f30b002]{display:flex;flex-direction:column;align-content:flex-start}.das-ui-form.horizontal[data-v-7f30b002]{flex-direction:row;flex-wrap:wrap}
+.das-ui-form[data-v-45483b0c]{display:flex;flex-direction:column;align-content:flex-start}.das-ui-form.horizontal[data-v-45483b0c]{flex-direction:row;flex-wrap:wrap}