@done-coding/admin-core 0.18.0 → 0.19.0

package/es/components/form/form-search-utils.mjs

@@ -1,63 +1,94 @@
-import { resolveFormLayout as p } from "./utils.mjs";
-const i = (t, e) => {
-  const n = p(t), o = n[e];
-  return typeof o == "number" ? o : n.span ?? 6;
-}, h = (t, e) => {
-  if (typeof t == "number") return t;
-  if (t && typeof t == "object") {
-    const n = t;
-    return (n.span ?? 24) + (n.offset ?? 0);
+import { resolveFormLayout } from "./utils.mjs";
+const getCurrentSpan = (layout, breakpoint) => {
+  const base = resolveFormLayout(layout);
+  const raw = base[breakpoint];
+  return typeof raw === "number" ? raw : base.span ?? 6;
+};
+const colOccupancy = (raw, fallback) => {
+  if (typeof raw === "number") return raw;
+  if (raw && typeof raw === "object") {
+    const o = raw;
+    return (o.span ?? 24) + (o.offset ?? 0);
   }
-  return e;
-}, m = (t, e) => {
-  const n = typeof t.span == "number" ? t.span : 24, o = h(
-    t[e],
-    n
+  return fallback;
+};
+const resolveSearchItemOccupancy = (merged, breakpoint) => {
+  const fallback = typeof merged.span === "number" ? merged.span : 24;
+  const occupancy = colOccupancy(
+    merged[breakpoint],
+    fallback
   );
-  return Math.min(24, Math.max(1, o));
-}, f = (t) => {
-  let e = 0, n = 0;
-  for (const o of t)
-    e === 0 || n + o > 24 ? (e += 1, n = o) : n += o;
-  return { rows: e, lastRowUsed: n };
-}, l = (t, e) => {
-  const { rows: n, lastRowUsed: o } = f(t), r = 24 - o;
-  return n > 0 && r >= e ? { totalRows: n, buttonSpan: r } : { totalRows: n + 1, buttonSpan: 24 };
-}, b = ({
-  spans: t,
-  buttonMinSpan: e,
-  maxRows: n,
-  collapsed: o
+  return Math.min(24, Math.max(1, occupancy));
+};
+const simulateSearchRows = (spans) => {
+  let rows = 0;
+  let lastRowUsed = 0;
+  for (const span of spans) {
+    if (rows === 0 || lastRowUsed + span > 24) {
+      rows += 1;
+      lastRowUsed = span;
+    } else {
+      lastRowUsed += span;
+    }
+  }
+  return { rows, lastRowUsed };
+};
+const placeSearchButtons = (spans, buttonMinSpan) => {
+  const { rows, lastRowUsed } = simulateSearchRows(spans);
+  const remaining = 24 - lastRowUsed;
+  if (rows > 0 && remaining >= buttonMinSpan) {
+    return { totalRows: rows, buttonSpan: remaining };
+  }
+  return { totalRows: rows + 1, buttonSpan: 24 };
+};
+const computeSearchGeometry = ({
+  spans,
+  buttonMinSpan,
+  maxRows,
+  collapsed
 }) => {
-  const r = Math.min(24, Math.max(1, e)), a = l(t, r);
-  if (n <= 0)
+  const minSpan = Math.min(24, Math.max(1, buttonMinSpan));
+  const full = placeSearchButtons(spans, minSpan);
+  if (maxRows <= 0) {
     return {
-      showCount: t.length,
-      needsFold: !1,
-      buttonSpan: a.buttonSpan
+      showCount: spans.length,
+      needsFold: false,
+      buttonSpan: full.buttonSpan
     };
-  let c = t.length, s = a;
-  for (; c > 0 && s.totalRows > n; )
-    c -= 1, s = l(t.slice(0, c), r);
+  }
+  let count = spans.length;
+  let placed = full;
+  while (count > 0 && placed.totalRows > maxRows) {
+    count -= 1;
+    placed = placeSearchButtons(spans.slice(0, count), minSpan);
+  }
   return {
-    showCount: o ? c : t.length,
-    needsFold: c < t.length,
-    buttonSpan: o ? s.buttonSpan : a.buttonSpan
+    showCount: collapsed ? count : spans.length,
+    needsFold: count < spans.length,
+    buttonSpan: collapsed ? placed.buttonSpan : full.buttonSpan
   };
-}, y = (t, e, n) => t ? { span: i(e, n) } : e, d = (t, e) => t ? "top" : e, w = (t, e) => {
-  const { compact: n, itemLayout: o, collapsing: r, threshold: a } = e;
-  if (!n && !r) return t;
-  let c = 0;
-  return t.map((s) => {
-    let u = s;
-    return n && (u = { ...u, layout: o }), s.hide !== !0 && (c += 1, r && c > a && (u = { ...u, hide: !0 })), u;
+};
+const resolveSearchLayout = (compact, layout, breakpoint) => compact ? { span: getCurrentSpan(layout, breakpoint) } : layout;
+const resolveSearchLabelPosition = (compact, labelPosition) => compact ? "top" : labelPosition;
+const packSearchFormList = (list, options) => {
+  const { compact, itemLayout, collapsing, threshold } = options;
+  if (!compact && !collapsing) return list;
+  let visibleSeen = 0;
+  return list.map((item) => {
+    let next = item;
+    if (compact) next = { ...next, layout: itemLayout };
+    if (item.hide !== true) {
+      visibleSeen += 1;
+      if (collapsing && visibleSeen > threshold) next = { ...next, hide: true };
+    }
+    return next;
   });
 };
 export {
-  b as computeSearchGeometry,
-  i as getCurrentSpan,
-  w as packSearchFormList,
-  m as resolveSearchItemOccupancy,
-  d as resolveSearchLabelPosition,
-  y as resolveSearchLayout
+  computeSearchGeometry,
+  getCurrentSpan,
+  packSearchFormList,
+  resolveSearchItemOccupancy,
+  resolveSearchLabelPosition,
+  resolveSearchLayout
 };

package/es/components/form/nest-form-item-list.mjs

@@ -1,71 +1,79 @@
-import { markRaw as K } from "vue";
-import M from "./FormItemNestFormList.vue.mjs";
-import { resolveLayoutSpan as N, parseFormData as S, stringifyFormData as T } from "./utils.mjs";
-const v = K(M);
-function k(l) {
+import { markRaw } from "vue";
+import FormItemNestFormList from "./FormItemNestFormList.vue.mjs";
+import { resolveLayoutSpan, parseFormData, stringifyFormData } from "./utils.mjs";
+const RawFormItemNestFormList = markRaw(FormItemNestFormList);
+function nestFormItemList(options) {
   const {
-    key: m,
-    label: n,
-    list: o,
-    rowKey: d,
-    itemFactory: h,
-    min: f,
-    max: y,
-    layout: p,
-    rowGutter: c,
-    addText: F,
-    removeText: R,
-    headerRender: w,
-    footerRender: A,
-    shadowColor: L,
-    rules: t,
-    init: x,
-    stringify: I,
-    parse: $,
-    rebase: C,
-    removeConfirm: D
-  } = l, i = f ?? 0, s = y ?? 1 / 0, u = {
-    validator: (r, e, a) => {
-      const g = Array.isArray(e) ? e.length : 0;
-      return g < i ? a(new Error(`${n}至少需要 ${i} 项`)) : g > s ? a(new Error(`${n}最多 ${s} 项`)) : a();
+    key,
+    label,
+    list,
+    rowKey,
+    itemFactory,
+    min,
+    max,
+    layout,
+    rowGutter,
+    addText,
+    removeText,
+    headerRender,
+    footerRender,
+    shadowColor,
+    rules,
+    init,
+    stringify,
+    parse,
+    rebase,
+    removeConfirm
+  } = options;
+  const effMin = min ?? 0;
+  const effMax = max ?? Infinity;
+  const lengthRule = {
+    validator: (_rule, value, callback) => {
+      const len = Array.isArray(value) ? value.length : 0;
+      if (len < effMin)
+        return callback(new Error(`${label}至少需要 ${effMin} 项`));
+      if (len > effMax) return callback(new Error(`${label}最多 ${effMax} 项`));
+      return callback();
     },
     trigger: "change"
-  }, E = i > 0 || s !== 1 / 0 ? typeof t == "function" ? (r) => [u, ...t(r)] : [u, ...t ?? []] : t;
+  };
+  const hasLengthRule = effMin > 0 || effMax !== Infinity;
+  const mergedRules = !hasLengthRule ? rules : typeof rules === "function" ? (scope) => [lengthRule, ...rules(scope)] : [lengthRule, ...rules ?? []];
   return {
-    key: m,
-    label: n,
-    layout: p,
-    rules: E,
+    key,
+    label,
+    layout,
+    rules: mergedRules,
     // 自动 pack（可覆盖）：父 generate/stringify/parse 对数组逐项递归。
     // init 缺省 = 空数组 []（[MUST NOT] 补 min 行改初始值；min/max 由上方 rules 校验）
-    init: x ?? (() => []),
-    stringify: I ?? ((r) => (Array.isArray(r) ? r : []).map(
-      (e) => T(e, o)
+    init: init ?? (() => []),
+    stringify: stringify ?? ((value) => (Array.isArray(value) ? value : []).map(
+      (t) => stringifyFormData(t, list)
     )),
-    parse: $ ?? ((r) => (Array.isArray(r) ? r : []).map((e) => S(e, o))),
+    parse: parse ?? ((value) => (Array.isArray(value) ? value : []).map((t) => parseFormData(t, list))),
     // render 用【组件本体引用】（非包裹 fn）：FormItem 经 vModel sugar 注入 modelValue/onUpdate，
     // 固定配置走 props。便于消费方按 `config.render === FormItemNestFormList` 判定"是联结组件"。
-    render: v,
+    render: RawFormItemNestFormList,
     props: {
-      nestKey: m,
-      list: o,
-      rowKey: d,
-      itemFactory: h,
-      min: f,
-      max: y,
-      rowGutter: c,
-      addText: F,
-      removeText: R,
-      headerRender: w,
-      footerRender: A,
-      shadowColor: L,
+      nestKey: key,
+      list,
+      rowKey,
+      itemFactory,
+      min,
+      max,
+      rowGutter,
+      addText,
+      removeText,
+      headerRender,
+      footerRender,
+      shadowColor,
       // P3：把父 item 代表 span 传薄壳，供其叠 rebase 因子算每行子 FormMain 的 layoutScale
-      parentSpan: N(p),
-      rebase: C,
-      removeConfirm: D
+      parentSpan: resolveLayoutSpan(layout),
+      rebase,
+      removeConfirm
     }
   };
 }
 export {
-  k as nestFormItemList
+  nestFormItemList
 };

package/es/components/form/nest-form-item.mjs

@@ -1,42 +1,42 @@
-import { markRaw as y } from "vue";
-import l from "./FormItemNestForm.vue.mjs";
-import { resolveLayoutSpan as u, parseFormData as g, stringifyFormData as w, generateFormData as c } from "./utils.mjs";
-const D = y(l);
-function k(a) {
+import { markRaw } from "vue";
+import FormItemNestForm from "./FormItemNestForm.vue.mjs";
+import { resolveLayoutSpan, parseFormData, stringifyFormData, generateFormData } from "./utils.mjs";
+const RawFormItemNestForm = markRaw(FormItemNestForm);
+function nestFormItem(options) {
   const {
-    key: e,
-    label: m,
-    list: r,
-    layout: o,
-    rowGutter: n,
-    shadowColor: s,
-    init: i,
-    stringify: p,
-    parse: F,
-    rebase: f
-  } = a;
+    key,
+    label,
+    list,
+    layout,
+    rowGutter,
+    shadowColor,
+    init,
+    stringify,
+    parse,
+    rebase
+  } = options;
   return {
-    key: e,
-    label: m,
-    layout: o,
+    key,
+    label,
+    layout,
     // 自动 pack（可覆盖）：父 generate/stringify/parse 递归进子 list
-    init: i ?? (() => c(r)),
-    stringify: p ?? ((t) => w(t ?? {}, r)),
-    parse: F ?? ((t) => g(t ?? {}, r)),
+    init: init ?? (() => generateFormData(list)),
+    stringify: stringify ?? ((value) => stringifyFormData(value ?? {}, list)),
+    parse: parse ?? ((value) => parseFormData(value ?? {}, list)),
     // render 用【组件本体引用】（非包裹 fn）：FormItem 经 vModel sugar 注入 modelValue/onUpdate，
     // 固定配置走 props。便于消费方按 `config.render === FormItemNestForm` 判定"是联结组件"。
-    render: D,
+    render: RawFormItemNestForm,
     props: {
-      nestKey: e,
-      list: r,
-      rowGutter: n,
-      shadowColor: s,
+      nestKey: key,
+      list,
+      rowGutter,
+      shadowColor,
       // P3：把父 item 代表 span 传薄壳，供其叠 rebase 因子算子 FormMain 的 layoutScale
-      parentSpan: u(o),
-      rebase: f
+      parentSpan: resolveLayoutSpan(layout),
+      rebase
     }
   };
 }
 export {
-  k as nestFormItem
+  nestFormItem
 };

package/es/components/form/nest-registry.mjs

@@ -1,7 +1,7 @@
-import { shallowReactive as e } from "vue";
-function r() {
-  return e({});
+import { shallowReactive } from "vue";
+function createNestFormExposeMap() {
+  return shallowReactive({});
 }
 export {
-  r as createNestFormExposeMap
+  createNestFormExposeMap
 };

package/es/components/form/use-form-submit.mjs

@@ -1,21 +1,24 @@
-import { ref as f } from "vue";
-function n(a) {
-  const e = f(!1);
-  return { submitting: e, submit: async () => {
-    var t, u, c;
-    (t = a.onSubmitStart) == null || t.call(a), e.value = !0;
+import { ref } from "vue";
+function useFormSubmit(options) {
+  const submitting = ref(false);
+  const submit = async () => {
+    var _a, _b, _c;
+    (_a = options.onSubmitStart) == null ? void 0 : _a.call(options);
+    submitting.value = true;
     try {
-      const r = a.getFormMainInstance();
-      await r.validate();
-      const m = r.stringify();
-      await a.submitFn(m), (u = a.onSuccess) == null || u.call(a, m);
-    } catch (r) {
-      (c = a.onFail) == null || c.call(a, r);
+      const formMainInstance = options.getFormMainInstance();
+      await formMainInstance.validate();
+      const stringifyData = formMainInstance.stringify();
+      await options.submitFn(stringifyData);
+      (_b = options.onSuccess) == null ? void 0 : _b.call(options, stringifyData);
+    } catch (error) {
+      (_c = options.onFail) == null ? void 0 : _c.call(options, error);
     } finally {
-      e.value = !1;
+      submitting.value = false;
     }
-  } };
+  };
+  return { submitting, submit };
 }
 export {
-  n as useFormSubmit
+  useFormSubmit
 };

package/es/components/form/use-layout-by-container.mjs

@@ -1,20 +1,28 @@
-import { watch as m } from "vue";
-import { useCustomBreakpoint as l } from "../../hooks/use-custom-breakpoint.mjs";
-const c = (r, o) => {
-  const { xs: n, sm: i, md: e, lg: a, xl: s, ...u } = r, t = { xs: n, sm: i, md: e, lg: a, xl: s }[o];
-  return t === void 0 ? u : typeof t == "number" ? { ...u, span: t } : { ...u, ...t };
+import { watch } from "vue";
+import { useCustomBreakpoint } from "../../hooks/use-custom-breakpoint.mjs";
+const resolveFormLayoutAtBreakpoint = (merged, breakpoint) => {
+  const { xs, sm, md, lg, xl, ...rest } = merged;
+  const raw = { xs, sm, md, lg, xl }[breakpoint];
+  if (raw === void 0) return rest;
+  if (typeof raw === "number") return { ...rest, span: raw };
+  return { ...rest, ...raw };
 };
-function y(r) {
-  const { elRef: o, activeBreakpoint: n } = l();
-  return m(
-    () => [r.enabled(), r.getForm()],
-    ([e, a]) => {
-      o.value = e ? a : void 0;
+function useFormLayoutByContainer(options) {
+  const { elRef, activeBreakpoint } = useCustomBreakpoint();
+  watch(
+    () => [options.enabled(), options.getForm()],
+    ([on, form]) => {
+      elRef.value = on ? form : void 0;
     },
-    { immediate: !0 }
-  ), { resolveLayoutByContainer: (e) => r.enabled() ? c(e, n.value) : e };
+    { immediate: true }
+  );
+  const resolveLayoutByContainer = (merged) => {
+    if (!options.enabled()) return merged;
+    return resolveFormLayoutAtBreakpoint(merged, activeBreakpoint.value);
+  };
+  return { resolveLayoutByContainer };
 }
 export {
-  c as resolveFormLayoutAtBreakpoint,
-  y as useFormLayoutByContainer
+  resolveFormLayoutAtBreakpoint,
+  useFormLayoutByContainer
 };

package/es/components/form/use-nest-form-list.mjs

@@ -1,22 +1,25 @@
-import { inject as s, onMounted as l, toValue as a, onBeforeUnmount as c } from "vue";
-import { FORM_NEST_REGISTRY_KEY as d } from "../../inject/key.mjs";
-function u(n) {
-  const { rowInstances: t, key: r } = n, o = s(d, null);
-  if (!o) return;
-  const i = {
-    validate: () => Promise.all(t().map((e) => e.validate())).then(() => {
+import { inject, onMounted, toValue, onBeforeUnmount } from "vue";
+import { FORM_NEST_REGISTRY_KEY } from "../../inject/key.mjs";
+function useNestFormList(options) {
+  const { rowInstances, key } = options;
+  const exposeMap = inject(FORM_NEST_REGISTRY_KEY, null);
+  if (!exposeMap) return;
+  const aggregate = {
+    validate: () => Promise.all(rowInstances().map((r) => r.validate())).then(() => {
     }),
-    clearValidate: () => t().forEach((e) => e.clearValidate()),
-    resetFields: () => t().forEach((e) => e.resetFields())
+    clearValidate: () => rowInstances().forEach((r) => r.clearValidate()),
+    resetFields: () => rowInstances().forEach((r) => r.resetFields())
   };
-  l(() => {
-    const e = a(r);
-    e !== void 0 && (o[e] = i);
-  }), c(() => {
-    const e = a(r);
-    e !== void 0 && delete o[e];
+  onMounted(() => {
+    const k = toValue(key);
+    if (k === void 0) return;
+    exposeMap[k] = aggregate;
+  });
+  onBeforeUnmount(() => {
+    const k = toValue(key);
+    if (k !== void 0) delete exposeMap[k];
   });
 }
 export {
-  u as useNestFormList
+  useNestFormList
 };

package/es/components/form/use-nest-form.mjs

@@ -1,34 +1,43 @@
-import { inject as d, onMounted as u, toValue as a, onBeforeUnmount as f } from "vue";
-import { FORM_NEST_REGISTRY_KEY as p } from "../../inject/key.mjs";
-function x(c) {
-  const { childRef: s, key: i } = c, l = () => {
-    var o;
-    return ((o = s.value) == null ? void 0 : o.validate()) ?? Promise.resolve();
-  }, r = (o) => {
-    var e;
-    return (e = s.value) == null ? void 0 : e.clearValidate(o);
-  }, n = () => {
-    var o;
-    return (o = s.value) == null ? void 0 : o.resetFields();
-  }, t = d(p, null);
-  if (t) {
-    const o = {
-      validate: () => l(),
-      clearValidate: (e) => r(e),
-      resetFields: () => n()
+import { inject, onMounted, toValue, onBeforeUnmount } from "vue";
+import { FORM_NEST_REGISTRY_KEY } from "../../inject/key.mjs";
+function useNestForm(options) {
+  const { childRef, key } = options;
+  const validateChild = () => {
+    var _a;
+    return ((_a = childRef.value) == null ? void 0 : _a.validate()) ?? Promise.resolve();
+  };
+  const clearChild = (k) => {
+    var _a;
+    return (_a = childRef.value) == null ? void 0 : _a.clearValidate(k);
+  };
+  const resetChild = () => {
+    var _a;
+    return (_a = childRef.value) == null ? void 0 : _a.resetFields();
+  };
+  const exposeMap = inject(FORM_NEST_REGISTRY_KEY, null);
+  if (exposeMap) {
+    const expose = {
+      validate: () => validateChild(),
+      clearValidate: (k) => clearChild(k),
+      resetFields: () => resetChild()
     };
-    u(() => {
-      const e = a(i);
-      e !== void 0 && (e in t && t[e] === o && console.error(
-        `[useNestForm] 嵌套 exposeMap 重复注册同一 expose（key="${e}"），疑似生命周期重复挂载；已继续挂载。`
-      ), t[e] = o);
-    }), f(() => {
-      const e = a(i);
-      e !== void 0 && delete t[e];
+    onMounted(() => {
+      const k = toValue(key);
+      if (k === void 0) return;
+      if (k in exposeMap && exposeMap[k] === expose) {
+        console.error(
+          `[useNestForm] 嵌套 exposeMap 重复注册同一 expose（key="${k}"），疑似生命周期重复挂载；已继续挂载。`
+        );
+      }
+      exposeMap[k] = expose;
+    });
+    onBeforeUnmount(() => {
+      const k = toValue(key);
+      if (k !== void 0) delete exposeMap[k];
     });
   }
-  return { validateChild: l, clearChild: r, resetChild: n };
+  return { validateChild, clearChild, resetChild };
 }
 export {
-  x as useNestForm
+  useNestForm
 };

package/es/components/form/use-nest-layout-scale.mjs

@@ -1,14 +1,15 @@
-import { inject as u, computed as c, toValue as o } from "vue";
-import { NEST_LAYOUT_SCALE_KEY as f } from "../../inject/key.mjs";
-function m(t) {
-  const r = u(f, void 0);
-  return c(() => {
-    const n = r ? r.value : 1;
-    if (o(t.rebase) === !1) return n;
-    const e = o(t.parentSpan), a = typeof e == "number" && e > 0 ? e : 24;
-    return n * (24 / a);
+import { inject, computed, toValue } from "vue";
+import { NEST_LAYOUT_SCALE_KEY } from "../../inject/key.mjs";
+function useNestLayoutScale(options) {
+  const parentScaleRef = inject(NEST_LAYOUT_SCALE_KEY, void 0);
+  return computed(() => {
+    const base = parentScaleRef ? parentScaleRef.value : 1;
+    if (toValue(options.rebase) === false) return base;
+    const span = toValue(options.parentSpan);
+    const eff = typeof span === "number" && span > 0 ? span : 24;
+    return base * (24 / eff);
   });
 }
 export {
-  m as useNestLayoutScale
+  useNestLayoutScale
 };