@aplus-frontend/ui 0.6.3 → 0.6.5

package/es/src/ap-form/search-form/hooks/use-sorter.mjs

@@ -0,0 +1,42 @@
+import { isBoolean as d } from "lodash-unified";
+import { ref as f, computed as c } from "vue";
+import { getStringName as p } from "../../item-group/helper.mjs";
+import { isDef as u } from "../../../utils/index.mjs";
+function l(s, r) {
+  var e;
+  const m = new Set(s.map((o) => o.name)), i = /* @__PURE__ */ new Map();
+  for (const o of r) {
+    const t = String(p((e = o.props) == null ? void 0 : e.name));
+    t && m.has(t) && i.set(t, o);
+  }
+  const a = /* @__PURE__ */ new Set(), n = [];
+  for (const o of s) {
+    const t = i.get(o.name);
+    t && (n.push(t), a.add(t));
+  }
+  for (const o of r)
+    a.has(o) || n.push(o);
+  return n;
+}
+const w = (s) => {
+  const r = f(!1), m = c(() => (s.value || []).map((n) => {
+    const e = n.props;
+    return {
+      label: e.description || e.label || e.placeholder,
+      name: p(e.name),
+      isHidden: d(e.hidden) ? !!e.hidden : u(e.hidden)
+    };
+  }));
+  function i(a) {
+    const n = l(a, s.value);
+    r.value = !0, s.value = n;
+  }
+  return {
+    items: m,
+    handleClickConfirm: i,
+    sorted: r
+  };
+};
+export {
+  w as useSorter
+};

package/es/src/ap-form/search-form/index.vue.d.ts

@@ -1,5 +1,5 @@
 import { ApFormExpose, ApFormSearchFormProps } from '../interface';
-import { ComponentInternalInstance, ExtractPropTypes, PropType, HTMLAttributes, VNodeProps, AllowedComponentProps, ComponentCustomProps, CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, Slot, ComponentPublicInstance, ComponentOptionsBase, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, DefineComponent, ComputedRef } from 'vue';
+import { ComponentInternalInstance, ExtractPropTypes, PropType, HTMLAttributes, VNodeProps, AllowedComponentProps, ComponentCustomProps, CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, Slot, ComponentPublicInstance, ComponentOptionsBase, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, DefineComponent } from 'vue';
 import { ButtonSize, SizeType } from '@aplus-frontend/antdv/es/button';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
 import { FormLabelAlign, ValidateMessages, FieldData, ValidateErrorEntity, NamePath, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
@@ -9,7 +9,7 @@ import { Options } from '../../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../../type';
 import { VueTypeDef, VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
-import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc } from '..';
+import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc, ApFormSearchFormPopoverSorterItem } from '..';
 import { OnCleanup } from '@vue/reactivity';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
@@ -839,7 +839,10 @@ declare function __VLS_template(): {
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
-    apForm: ComputedRef<ApFormExpose | undefined>;
+    apForm: ApFormExpose;
+    getSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+    setSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+    resetSorterItems: () => void;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApFormSearchFormProps> & Readonly<{}>, {
     collapse: boolean;
     layout: string;

package/es/src/ap-form/search-form/index.vue.mjs

@@ -1,25 +1,26 @@
-import { isVNode as oe, defineComponent as ae, useSlots as ne, ref as L, shallowRef as U, computed as _, unref as a, watch as V, createVNode as t, Fragment as w, createBlock as y, openBlock as f, mergeProps as le, withCtx as A, resolveDynamicComponent as B, createElementBlock as re, renderList as se } from "vue";
-import { Col as R, Flex as N, Button as W, Row as ie } from "@aplus-frontend/antdv";
+import { isVNode as le, defineComponent as re, useSlots as se, ref as U, shallowRef as W, computed as S, unref as n, watch as M, createVNode as t, Fragment as _, createBlock as g, openBlock as d, mergeProps as ie, withCtx as B, resolveDynamicComponent as I, createElementBlock as ue, renderList as ce } from "vue";
+import { Col as w, Flex as N, Button as z, Row as pe } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
-import { genRealChildren as M } from "../item-group/helper.mjs";
+import { genRealChildren as D } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
-import { isArray as ue, isBoolean as ce, omit as pe } from "lodash-unified";
-import { isDef as z } from "../../utils/index.mjs";
-import { execFunc as D, diffFormItem as de } from "./utils.mjs";
+import { isArray as de, isBoolean as me, omit as fe } from "lodash-unified";
+import { isDef as q } from "../../utils/index.mjs";
+import { execFunc as H, diffFormItem as he } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
-import { useCountPerRow as fe } from "./hooks/use-count-per-row.mjs";
+import { useCountPerRow as xe } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
-import { useNamespace as me } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as he } from "../../config-provider/hooks/use-locale.mjs";
-import q from "../item/index.vue.mjs";
-import xe from "./components/popover-filter.vue2.mjs";
-import ye from "./components/popover-sorter/index.vue2.mjs";
-import ge from "../ap-form.vue2.mjs";
-function ve(m) {
-  return typeof m == "function" || Object.prototype.toString.call(m) === "[object Object]" && !oe(m);
+import { useSorter as ge } from "./hooks/use-sorter.mjs";
+import { useNamespace as ye } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as ve } from "../../config-provider/hooks/use-locale.mjs";
+import G from "../item/index.vue.mjs";
+import Ce from "./components/popover-filter.vue2.mjs";
+import Se from "./components/popover-sorter/index.vue2.mjs";
+import _e from "../ap-form.vue2.mjs";
+function we(m) {
+  return typeof m == "function" || Object.prototype.toString.call(m) === "[object Object]" && !le(m);
 }
-const s = 24, Ue = /* @__PURE__ */ ae({
+const s = 24, De = /* @__PURE__ */ re({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -112,140 +113,149 @@ const s = 24, Ue = /* @__PURE__ */ ae({
     resizeTarget: {}
   },
   setup(m, {
-    expose: H
+    expose: J
   }) {
-    var P;
-    const i = ne(), o = m, {
-      b: h
-    } = me("ap-form-search-form"), {
+    var L;
+    const i = se(), o = m, {
+      b: f
+    } = ye("ap-form-search-form"), {
       t: k
-    } = he(), G = fe(o), g = L();
+    } = ve(), K = xe(o), y = U(), Q = U();
     function T() {
-      var n;
-      const e = (n = g.value) == null ? void 0 : n.getFieldsValueTransformed(!0);
-      D(o.onSubmit, e);
+      var a;
+      const e = (a = y.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
+      H(o.onSubmit, e);
     }
-    function J() {
-      var e, n;
-      o.customReset || (n = (e = g.value) == null ? void 0 : e.resetFields) == null || n.call(e), D(o.onReset);
+    function X() {
+      var e, a;
+      o.customReset || (a = (e = y.value) == null ? void 0 : e.resetFields) == null || a.call(e), H(o.onReset);
     }
-    const K = (e) => z(e) ? (ue(e) ? e : [e]).join("") : Date.now();
-    let I = [];
-    const u = U(M(i.default())), b = L(!1), p = U((P = i.extra) == null ? void 0 : P.call(i)), E = _(() => Math.floor(s / a(G)));
-    V(() => i.default(), (e) => {
-      I = u.value, u.value = de(I, M(e)), b.value = !1;
-    }), V(() => {
+    const Y = (e) => q(e) ? (de(e) ? e : [e]).join("") : Date.now();
+    let E = [];
+    const h = W(D(i.default())), c = W((L = i.extra) == null ? void 0 : L.call(i)), P = S(() => Math.floor(s / n(K))), {
+      items: R,
+      sorted: O,
+      handleClickConfirm: b
+    } = ge(h);
+    M(() => i.default(), (e) => {
+      E = h.value, h.value = he(E, D(e)), O.value = !1;
+    }), M(() => {
       var e;
       return (e = i.extra) == null ? void 0 : e.call(i);
     }, (e) => {
-      p.value = e;
+      c.value = e;
     });
-    const l = _(() => {
-      const e = u.value, n = [], r = [], x = [], c = a(E);
-      let v = 0, S = 0;
-      const Y = s * o.maxRows - c * (a(p) && !o.extraInAction ? 2 : 1);
-      e.forEach((F, te) => {
-        const d = F.props;
-        if (ce(d.hidden) ? !!d.hidden : z(d.hidden))
-          n.push(F);
+    const l = S(() => {
+      const e = h.value, a = [], r = [], x = [], u = n(P);
+      let v = 0, F = 0;
+      const te = s * o.maxRows - u * (n(c) && !o.extraInAction ? 2 : 1);
+      e.forEach((A, ne) => {
+        const p = A.props;
+        if (me(p.hidden) ? !!p.hidden : q(p.hidden))
+          a.push(A);
         else {
-          let C = d.span || c;
-          const $ = {
-            node: F,
+          let C = p.span || u;
+          const j = {
+            node: A,
             span: C,
-            key: `ApFormSearchFormItem-${te}-${K(d.name)}-${d._signal}`
-          }, j = s - v % s;
-          j < C && (C += j), v += C, v > Y ? r.push($) : (S = v, x.push($));
+            key: `ApFormSearchFormItem-${ne}-${Y(p.name)}-${p._signal}`
+          }, V = s - v % s;
+          V < C && (C += V), v += C, v > te ? r.push(j) : (F = v, x.push(j));
         }
       });
-      const O = s - (S + c) % s, Z = S % s < c, ee = O < c ? s : O;
+      const $ = s - (F + u) % s, oe = F % s < u, ae = $ < u ? s : $;
       return {
-        hideNode: t(w, null, [n]),
+        hideNode: t(_, null, [a]),
         nodes: x,
         collapseNodes: r,
-        extraSpan: ee,
-        lastRowOnlyIncludeActionAndExtra: Z
+        extraSpan: ae,
+        lastRowOnlyIncludeActionAndExtra: oe
       };
-    });
-    function Q(e) {
-      u.value = [...e], b.value = !0;
-    }
-    const X = _(() => {
+    }), Z = S(() => {
       let e;
-      const n = l.value.collapseNodes.length || o.sortable && u.value.length, r = t(R, {
-        span: a(E),
+      const a = l.value.collapseNodes.length || o.sortable && h.value.length, r = t(w, {
+        span: n(P),
         key: "actionWrapper"
       }, {
-        default: () => [t(q, null, {
+        default: () => [t(G, null, {
           default: () => [t(N, {
             wrap: "wrap",
-            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(a(p) && o.extraInAction) ? "flex-end" : "space-between"
+            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(c) && o.extraInAction) ? "flex-end" : "space-between"
           }, {
             default: () => [t(N, {
               gap: 8,
               wrap: "wrap"
             }, {
-              default: () => [n ? t("div", {
-                class: h("column-setting-trigger-wrapper")
-              }, [l.value.collapseNodes.length ? t(xe, {
+              default: () => [a ? t("div", {
+                class: f("column-setting-trigger-wrapper")
+              }, [l.value.collapseNodes.length ? t(Ce, {
                 onSubmit: T,
                 config: l.value.collapseNodes,
                 submitLoading: o.submitLoading
-              }, null) : null, o.sortable && u.value.length ? t(ye, {
-                children: u.value,
-                onClickConfirm: Q,
-                sorted: b.value
-              }, null) : null]) : null, t(W, {
+              }, null) : null, o.sortable && R.value.length ? t(Se, {
+                ref: "sorterIns",
+                items: R.value,
+                onClickConfirm: b,
+                sorted: O.value
+              }, null) : null]) : null, t(z, {
                 type: "primary",
                 onClick: T,
                 loading: o.submitLoading,
                 htmlType: "submit",
-                class: h("action-btn")
+                class: f("action-btn")
               }, {
                 default: () => [o.searchText || k("ap.apForm.search.search")]
-              }), t(W, {
-                onClick: J,
+              }), t(z, {
+                onClick: X,
                 type: "text",
-                class: [h("action-btn"), h("action-btn-reset")]
+                class: [f("action-btn"), f("action-btn-reset")]
               }, {
                 default: () => [o.resetText || k("ap.apForm.search.reset")]
               })]
-            }), o.extraInAction ? a(p) : null]
+            }), o.extraInAction ? n(c) : null]
           })]
         })]
-      }), x = !o.extraInAction && a(p) ? t(R, {
+      }), x = !o.extraInAction && n(c) ? t(w, {
         span: l.value.extraSpan,
         key: "extraNode"
       }, {
-        default: () => [t(q, null, {
+        default: () => [t(G, null, {
           default: () => [t(N, {
             justify: l.value.extraSpan === s || l.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
-          }, ve(e = a(p)) ? e : {
+          }, we(e = n(c)) ? e : {
             default: () => [e]
           })]
         })]
-      }) : null, c = t(R, {
+      }) : null, u = t(w, {
         span: l.value.extraSpan
       }, null);
-      return l.value.lastRowOnlyIncludeActionAndExtra ? t(w, null, [x || c, r]) : t(w, null, [r, x]);
+      return l.value.lastRowOnlyIncludeActionAndExtra ? t(_, null, [x || u, r]) : t(_, null, [r, x]);
     });
-    return H({
-      apForm: _(() => a(g))
-    }), (e, n) => (f(), y(ge, le({
+    function ee() {
+      var a;
+      const e = (a = Q.value) == null ? void 0 : a.getCachedList();
+      b(e);
+    }
+    return J({
+      apForm: S(() => n(y)),
+      getSorterItems: () => R.value,
+      setSorterItems: b,
+      resetSorterItems: ee
+    }), (e, a) => (d(), g(_e, ie({
       ref_key: "apForm",
-      ref: g,
-      class: a(h)()
-    }, a(pe)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: A(() => [(f(), y(B(l.value.hideNode))), t(a(ie), {
+      ref: y,
+      class: n(f)()
+    }, n(fe)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: B(() => [(d(), g(I(l.value.hideNode))), t(n(pe), {
         gutter: 8
       }, {
-        default: A(() => [(f(!0), re(w, null, se(l.value.nodes, (r) => (f(), y(a(R), {
+        default: B(() => [(d(!0), ue(_, null, ce(l.value.nodes, (r) => (d(), g(n(w), {
           key: r.key,
           span: r.span
         }, {
-          default: A(() => [(f(), y(B(r.node)))]),
+          default: B(() => [(d(), g(I(r.node)))]),
           _: 2
-        }, 1032, ["span"]))), 128)), (f(), y(B(X.value)))]),
+        }, 1032, ["span"]))), 128)), (d(), g(I(Z.value)))]),
         _: 1
       })]),
       _: 1
@@ -253,5 +263,5 @@ const s = 24, Ue = /* @__PURE__ */ ae({
   }
 });
 export {
-  Ue as default
+  De as default
 };