@aplus-frontend/ui 0.0.28 → 0.0.29

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

@@ -1,24 +1,23 @@
-import { isVNode as J, defineComponent as K, useSlots as Q, ref as X, unref as o, shallowRef as P, computed as C, watch as k, cloneVNode as Y, createVNode as a, Fragment as Z, openBlock as A, createBlock as E, mergeProps as ee, withCtx as N, resolveDynamicComponent as te } from "vue";
-import { Flex as T, Space as oe, Button as y } from "ant-design-vue";
+import { isVNode as ee, defineComponent as te, useSlots as ae, ref as oe, unref as t, shallowRef as j, computed as C, watch as I, cloneVNode as le, createVNode as l, Fragment as S, openBlock as c, createBlock as h, mergeProps as ne, withCtx as R, resolveDynamicComponent as F, createElementBlock as re, renderList as se } from "vue";
+import { Col as B, Flex as D, Space as ue, Button as b, Row as pe } from "ant-design-vue";
 import "../ap-form.vue.mjs";
-import "../ap-form-item-group/index.vue2.mjs";
 import "../ap-form-item.vue2.mjs";
 import "../../hooks/index.mjs";
-import { genRealChildren as V } from "../ap-form-item-group/helper.mjs";
-import { DoubleRightOutlined as ae } from "@ant-design/icons-vue";
+import { genRealChildren as O } from "../ap-form-item-group/helper.mjs";
+import { DoubleRightOutlined as ie } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
 import "../style/search-form.css";
-import { omit as le } from "lodash-unified";
-import { useControllableValue as ne } from "../../hooks/useControllableValue.mjs";
-import { useNamespace as re } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as se } from "../../config-provider/hooks/use-locale.mjs";
-import I from "../ap-form-item.vue.mjs";
-import pe from "../ap-form.vue2.mjs";
-import ce from "../ap-form-item-group/index.vue.mjs";
-function ie(i) {
-  return typeof i == "function" || Object.prototype.toString.call(i) === "[object Object]" && !J(i);
+import { isArray as ce, omit as de } from "lodash-unified";
+import { isDef as fe } from "../../utils/index.mjs";
+import { useControllableValue as me } from "../../hooks/useControllableValue.mjs";
+import { useNamespace as he } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as xe } from "../../config-provider/hooks/use-locale.mjs";
+import L from "../ap-form-item.vue.mjs";
+import Ce from "../ap-form.vue2.mjs";
+function ge(d) {
+  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !ee(d);
 }
-const s = 24, Pe = /* @__PURE__ */ K({
+const p = 24, Ie = /* @__PURE__ */ te({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -97,113 +96,138 @@ const s = 24, Pe = /* @__PURE__ */ K({
     }
   },
   emits: ["update:collapse"],
-  setup(i, {
-    expose: j,
-    emit: M
+  setup(d, {
+    expose: M,
+    emit: $
   }) {
-    var S;
-    const l = Q(), t = i, O = M, {
-      value: u,
-      updateValue: $
-    } = ne(t, O, {
+    var N;
+    const r = ae(), a = d, q = $, {
+      value: f,
+      updateValue: z
+    } = me(a, q, {
       valuePropName: "collapse",
       defaultValuePropName: "defaultCollapse"
     }), {
-      b: D
-    } = re("ap-form-search-form"), {
-      t: g
-    } = se(), m = X();
-    function L() {
-      $(!o(u));
+      b: U
+    } = he("ap-form-search-form"), {
+      t: v
+    } = xe(), x = oe();
+    function W() {
+      z(!t(f));
     }
-    function q() {
-      var e, n;
-      (n = (e = m.value) == null ? void 0 : e.validateFields()) == null || n.then(t.onSubmit);
+    function G() {
+      var e, o;
+      (o = (e = x.value) == null ? void 0 : e.validateFields()) == null || o.then(a.onSubmit);
     }
-    function z() {
-      var e, n, f;
-      t.customReset || (n = (e = m.value) == null ? void 0 : e.resetFields) == null || n.call(e), (f = t.onReset) == null || f.call(t);
+    function H() {
+      var e, o, n;
+      a.customReset || (o = (e = x.value) == null ? void 0 : e.resetFields) == null || o.call(e), (n = a.onReset) == null || n.call(a);
     }
-    const R = P(V(l.default())), d = P((S = l.extra) == null ? void 0 : S.call(l)), F = C(() => Math.floor(s / t.countPerRow));
-    k(() => l.default(), (e) => {
-      R.value = V(e);
-    }), k(() => {
+    const w = j(O(r.default())), m = j((N = r.extra) == null ? void 0 : N.call(r)), E = C(() => Math.floor(p / a.countPerRow));
+    I(() => r.default(), (e) => {
+      w.value = O(e);
+    }), I(() => {
       var e;
-      return (e = l.extra) == null ? void 0 : e.call(l);
+      return (e = r.extra) == null ? void 0 : e.call(r);
     }, (e) => {
-      d.value = e;
+      m.value = e;
     });
-    const U = C(() => {
-      let e;
-      const n = [...o(R)], f = [], b = [], r = o(F);
-      let h = 0;
-      n.forEach((p) => {
-        const c = p.props;
-        c != null && c.hidden ? f.push(p) : (h += c.span || r, b.push(p));
+    const J = (e) => fe(e) ? (ce(e) ? e : [e]).join("") : Date.now(), g = C(() => {
+      const e = [...t(w)], o = [], n = [], s = t(E);
+      let y = 0;
+      e.forEach((u) => {
+        const i = u.props;
+        i != null && i.hidden ? o.push(u) : (y += i.span || s, n.push(u));
       });
-      const B = s - (h + r) % s, w = B < r ? s : B, x = s - r * (o(d) && !t.extraInAction ? 2 : 1), W = !t.forceExpand && h > x;
-      let _ = 0;
-      const G = b.map((p, c) => {
-        const v = p.props;
-        return _ += v.span || r, Y(p, {
-          span: v.span || r,
-          key: `ApFormSearchFormItem-${c}-${Date.now()}`,
-          hidden: !t.forceExpand && o(u) && _ > x
-        });
-      }), H = s - Math.min(x, _) - r;
-      return a(Z, null, [G, f, a(I, {
-        span: o(F)
+      const k = p - (y + s) % p, Q = k < s ? p : k, A = p - s * (t(m) && !a.extraInAction ? 2 : 1), X = !a.forceExpand && y > A;
+      let P = 0, T = 0;
+      const Y = n.map((u, i) => {
+        const _ = u.props, V = _.span || s;
+        if (P += V, !a.forceExpand && t(f) && P > A) {
+          o.push(le(u, {
+            hidden: !0
+          }));
+          return;
+        }
+        return T += V, {
+          node: u,
+          span: _.span || s,
+          key: `ApFormSearchFormItem-${i}-${J(_.name)}`
+        };
+      }).filter(Boolean), Z = p - T - s;
+      return {
+        hideNode: l(S, null, [o]),
+        nodes: Y,
+        defaultExtraSpan: Q,
+        actualExtraSpan: Z,
+        showCollapse: X
+      };
+    }), K = C(() => {
+      let e;
+      const o = t(g);
+      return l(S, null, [l(B, {
+        span: t(t(E))
       }, {
-        default: () => [a(T, {
-          justify: "space-between"
-        }, {
-          default: () => [a(oe, null, {
-            default: () => [a(y, {
-              type: "primary",
-              onClick: q,
-              loading: t.submitLoading
-            }, {
-              default: () => [t.searchText || g("ap.apForm.search.search")]
-            }), a(y, {
-              onClick: z
-            }, {
-              default: () => [t.resetText || g("ap.apForm.search.reset")]
-            }), W ? a(y, {
-              onClick: L,
-              icon: a(ae, {
-                style: "color:#B8C3D1",
-                rotate: o(u) ? 90 : -90
-              }, null)
-            }, null) : null]
-          }), t.extraInAction ? o(d) : null]
+        default: () => [l(L, null, {
+          default: () => [l(D, {
+            justify: "space-between"
+          }, {
+            default: () => [l(ue, null, {
+              default: () => [l(b, {
+                type: "primary",
+                onClick: G,
+                loading: a.submitLoading
+              }, {
+                default: () => [a.searchText || v("ap.apForm.search.search")]
+              }), l(b, {
+                onClick: H
+              }, {
+                default: () => [a.resetText || v("ap.apForm.search.reset")]
+              }), o.showCollapse ? l(b, {
+                onClick: W,
+                icon: l(ie, {
+                  style: "color:#B8C3D1",
+                  rotate: t(f) ? 90 : -90
+                }, null)
+              }, null) : null]
+            }), a.extraInAction ? t(m) : null]
+          })]
         })]
-      }), !t.extraInAction && o(d) ? a(I, {
-        span: o(u) ? H : w
+      }), !a.extraInAction && t(m) ? l(B, {
+        span: t(f) ? o.actualExtraSpan : o.defaultExtraSpan
       }, {
-        default: () => [a(T, {
-          justify: !o(u) && w === s ? "start" : "end"
-        }, ie(e = o(d)) ? e : {
-          default: () => [e]
+        default: () => [l(L, null, {
+          default: () => [l(D, {
+            justify: !t(f) && o.defaultExtraSpan === p ? "start" : "end"
+          }, ge(e = t(m)) ? e : {
+            default: () => [e]
+          })]
         })]
       }) : null]);
     });
-    return j({
-      apForm: C(() => o(m))
-    }), (e, n) => (A(), E(pe, ee({
-      class: o(D)(),
+    return M({
+      apForm: C(() => t(x))
+    }), (e, o) => (c(), h(Ce, ne({
+      class: t(U)(),
       ref_key: "apForm",
-      ref: m
-    }, o(le)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: N(() => [a(ce, {
-        "count-per-row": t.countPerRow
+      ref: x
+    }, t(de)(a, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: R(() => [(c(), h(F(g.value.hideNode))), l(t(pe), {
+        gutter: 16
       }, {
-        default: N(() => [(A(), E(te(U.value)))]),
+        default: R(() => [(c(!0), re(S, null, se(g.value.nodes, (n) => (c(), h(t(B), {
+          key: n.key,
+          span: n.span
+        }, {
+          default: R(() => [(c(), h(F(n.node)))]),
+          _: 2
+        }, 1032, ["span"]))), 128)), (c(), h(F(K.value)))]),
         _: 1
-      }, 8, ["count-per-row"])]),
+      })]),
       _: 1
     }, 16, ["class"]));
   }
 });
 export {
-  Pe as default
+  Ie as default
 };

package/es/src/ap-table/hooks/use-table-paging.mjs

@@ -1,10 +1,10 @@
-import { ref as v, unref as r, onMounted as N, computed as j } from "vue";
-import { parseFieldValue as U, dataIndexToStr as W } from "../utils.mjs";
-import { isArray as X } from "lodash-unified";
+import { ref as v, nextTick as N, unref as r, onMounted as U, computed as $ } from "vue";
+import { parseFieldValue as W, dataIndexToStr as X } from "../utils.mjs";
+import { isArray as Y } from "lodash-unified";
 import "../../config-provider/index.mjs";
-import { useLocale as Y } from "../../config-provider/hooks/use-locale.mjs";
-const ae = ({
-  manual: x = !1,
+import { useLocale as Z } from "../../config-provider/hooks/use-locale.mjs";
+const oe = ({
+  manual: j = !1,
   defaultCurrent: y = 1,
   defaultPageSize: S = 10,
   request: D,
@@ -17,7 +17,7 @@ const ae = ({
   sortFields: E = []
 }) => {
   let F = 0, f = {};
-  const L = (e) => T ? T(e) : e, l = v(), i = v(y), g = v(S), { t: V } = Y(), n = v({
+  const L = (e) => T ? T(e) : e, l = v(), i = v(y), g = v(S), { t: V } = Z(), n = v({
     total: 0,
     records: A,
     loading: !1
@@ -41,15 +41,17 @@ const ae = ({
     return Object.entries(e).forEach(([t, o]) => {
       if (a[t] = o, z && o) {
         const s = z[t];
-        s && (a[t] = U(s, o));
+        s && (a[t] = W(s, o));
       }
     }), a;
   }, M = (e) => {
     var o, s, d, p, m, u, c;
     const a = ((s = (o = l.value) == null ? void 0 : o.apForm) == null ? void 0 : s.getFieldsValue()) || {}, t = {};
-    Object.entries(a).forEach(([$, K]) => {
-      P && P.indexOf($) > -1 && (t[$] = K);
-    }), (p = (d = l.value) == null ? void 0 : d.apForm) == null || p.resetFields(), (c = (u = (m = l.value) == null ? void 0 : m.apForm) == null ? void 0 : u.setFieldsValue) == null || c.call(u, t), e == null || e();
+    Object.entries(a).forEach(([O, K]) => {
+      P && P.indexOf(O) > -1 && (t[O] = K);
+    }), (p = (d = l.value) == null ? void 0 : d.apForm) == null || p.resetFields(), (c = (u = (m = l.value) == null ? void 0 : m.apForm) == null ? void 0 : u.setFieldsValue) == null || c.call(u, t), N(() => {
+      e == null || e();
+    });
   }, h = (e) => {
     f = e;
     const a = w(e);
@@ -76,13 +78,13 @@ const ae = ({
     q({
       current: o > 0 ? o : 1
     });
-  }, O = (e, a, t) => {
+  }, x = (e, a, t) => {
     var m, u;
     const o = ((u = (m = l.value) == null ? void 0 : m.apForm) == null ? void 0 : u.getFieldsValue(!0)) || {};
     i.value = e.current, g.value = e.pageSize;
-    const s = X(t) ? [...t] : [t], d = {};
+    const s = Y(t) ? [...t] : [t], d = {};
     for (const c of s)
-      E.includes(c.field) && (d[W(c.field)] = c.order);
+      E.includes(c.field) && (d[X(c.field)] = c.order);
     const p = {};
     for (const c of Object.keys(a))
       B.includes(c) && (p[c] = a[c]);
@@ -94,21 +96,21 @@ const ae = ({
       pageSize: e.pageSize
     });
   };
-  N(() => {
+  U(() => {
     var a, t;
     const e = ((t = (a = l.value) == null ? void 0 : a.apForm) == null ? void 0 : t.getFieldsValue(!0)) || {};
     if (f = {
       current: r(i),
       pageSize: r(g),
       ...e
-    }, !x) {
+    }, !j) {
       const o = w(f);
       b(o);
     }
   });
-  const H = j(() => r(n).total === 0 ? "-" : `${r(i.value)}/${Math.ceil(
+  const H = $(() => r(n).total === 0 ? "-" : `${r(i.value)}/${Math.ceil(
     r(n).total / r(g)
-  )}`), I = j(() => ({
+  )}`), I = $(() => ({
     loading: r(n).loading,
     pagination: {
       current: r(i),
@@ -121,7 +123,7 @@ const ae = ({
         { page: r(H) }
       )}`
     },
-    onChange: O,
+    onChange: x,
     dataSource: r(n).records
   }));
   return {
@@ -133,10 +135,10 @@ const ae = ({
     data: n,
     current: i,
     pageSize: g,
-    handleTableChange: O,
+    handleTableChange: x,
     tableProps: I
   };
 };
 export {
-  ae as useTablePaging
+  oe as useTablePaging
 };

package/es/src/ap-upload/apUpload.vue.d.ts

@@ -1,11 +1,11 @@
 import { PropType, VNode, DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ExtractPropTypes, RendererNode, RendererElement } from 'vue';
 import { FileUploadType, BeforeUpload, CustomRequest } from './apUploadTypes';
+import { accessCreate } from '@aplus-frontend/oss';
 
 declare function clear(): void;
 declare const _default: DefineComponent<{
     dirName: {
         type: StringConstructor;
-        default: string;
     };
     type: {
         type: PropType<FileUploadType>;
@@ -17,11 +17,9 @@ declare const _default: DefineComponent<{
     };
     needName: {
         type: (BooleanConstructor | ObjectConstructor)[];
-        default: boolean;
     };
     accept: {
         type: StringConstructor;
-        default: string;
     };
     maxSize: {
         type: NumberConstructor;
@@ -44,7 +42,7 @@ declare const _default: DefineComponent<{
         type: PropType<CustomRequest>;
     };
     getOssAccess: {
-        type: FunctionConstructor;
+        type: PropType<() => Promise< accessCreate>>;
     };
 }, {
     done: ComputedRef<boolean>;
@@ -54,7 +52,6 @@ declare const _default: DefineComponent<{
 }, string, PublicProps, Readonly< ExtractPropTypes<{
     dirName: {
         type: StringConstructor;
-        default: string;
     };
     type: {
         type: PropType<FileUploadType>;
@@ -66,11 +63,9 @@ declare const _default: DefineComponent<{
     };
     needName: {
         type: (BooleanConstructor | ObjectConstructor)[];
-        default: boolean;
     };
     accept: {
         type: StringConstructor;
-        default: string;
     };
     maxSize: {
         type: NumberConstructor;
@@ -93,7 +88,7 @@ declare const _default: DefineComponent<{
         type: PropType<CustomRequest>;
     };
     getOssAccess: {
-        type: FunctionConstructor;
+        type: PropType<() => Promise< accessCreate>>;
     };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -101,11 +96,8 @@ declare const _default: DefineComponent<{
     type: FileUploadType;
     title: string;
     value: string | unknown[] | Record<string, any>;
-    accept: string;
-    dirName: string;
     subTitle: string | VNode< RendererNode, RendererElement, {
         [key: string]: any;
     }>;
-    needName: boolean | Record<string, any>;
 }, {}>;
 export default _default;

package/es/src/ap-upload/apUpload.vue.mjs

@@ -1,21 +1,23 @@
-import { defineComponent as b, computed as r, provide as e, ref as u, openBlock as i, createElementBlock as _, normalizeClass as C, unref as N, createBlock as S, resolveDynamicComponent as x, normalizeProps as F, mergeProps as O, createCommentVNode as z } from "vue";
+import { defineComponent as F, computed as c, provide as e, ref as u, openBlock as d, createElementBlock as U, normalizeClass as T, unref as j, createBlock as z, resolveDynamicComponent as h, normalizeProps as k, mergeProps as B, createCommentVNode as $ } from "vue";
 import "../config-provider/index.mjs";
 import "./components/SingleFile.vue.mjs";
 import "./components/MultipleFile.vue.mjs";
 import "./components/Picture.vue.mjs";
 import "./styles/upload.css";
-import { useNamespace as A } from "../config-provider/hooks/use-namespace.mjs";
-import U from "./components/SingleFile.vue2.mjs";
-import h from "./components/MultipleFile.vue2.mjs";
-import k from "./components/Picture.vue2.mjs";
-import { useGlobalConfig as B } from "../config-provider/hooks/use-global-config.mjs";
-const H = /* @__PURE__ */ b({
+import { injectLocaleToAccept as q } from "./utils/accept.mjs";
+import { injectLocaleToOss as L } from "./hooks/useOss.mjs";
+import { useLocale as R } from "../config-provider/hooks/use-locale.mjs";
+import { useNamespace as M } from "../config-provider/hooks/use-namespace.mjs";
+import P from "./components/SingleFile.vue2.mjs";
+import w from "./components/MultipleFile.vue2.mjs";
+import D from "./components/Picture.vue2.mjs";
+import { useGlobalConfig as f } from "../config-provider/hooks/use-global-config.mjs";
+const ae = /* @__PURE__ */ F({
   name: "AplusFileUpload",
   __name: "apUpload",
   props: {
     dirName: {
-      type: String,
-      default: "FileDemo"
+      type: String
     },
     type: {
       type: String,
@@ -26,12 +28,10 @@ const H = /* @__PURE__ */ b({
       default: void 0
     },
     needName: {
-      type: [Boolean, Object],
-      default: !1
+      type: [Boolean, Object]
     },
     accept: {
-      type: String,
-      default: ""
+      type: String
     },
     maxSize: {
       type: Number
@@ -58,38 +58,44 @@ const H = /* @__PURE__ */ b({
     }
   },
   emits: ["update:value"],
-  setup(s, { expose: l, emit: m }) {
-    const { b: p } = A("ap-upload"), t = s, c = m, d = {
-      singleFile: U,
-      multipleFile: h,
-      picture: k
-    }, f = r({
+  setup(g, { expose: v, emit: y }) {
+    var r, i, m, l;
+    const { t: s, lang: b } = R();
+    q(s), L(s, b);
+    const { b: N } = M("ap-upload"), t = g, C = y, _ = {
+      singleFile: P,
+      multipleFile: w,
+      picture: D
+    }, S = c({
       get() {
         return t.value;
       },
-      set(a) {
-        c("update:value", a);
+      set(n) {
+        C("update:value", n);
       }
-    }), y = B("uiMode");
-    e("theme", y.value), e("value", f), e("dirName", t.dirName), e("needName", t.needName), e("accept", t.accept), e("maxSize", t.maxSize), e("title", t.title), e("subTitle", t.subTitle), e("maxCount", t.maxCount), e("beforeUpload", t.beforeUpload), e("customRequest", t.customRequest), e("getOssAccess", t.getOssAccess);
-    const g = r(() => n.value === 0), n = u(0);
-    e("uploadingCount", n);
-    const o = u(!0);
-    function v() {
-      o.value = !1, setTimeout(() => {
-        o.value = !0;
+    }), x = f("uiMode"), o = f("apUpload");
+    e("theme", x.value), e("value", S), e("dirName", t.dirName ?? ((r = o.value) == null ? void 0 : r.dirName)), e("needName", t.needName ?? ((i = o.value) == null ? void 0 : i.needName) ?? !1), e("accept", t.accept ?? ((m = o.value) == null ? void 0 : m.accept) ?? ""), e("maxSize", t.maxSize), e("title", t.title), e("subTitle", t.subTitle), e("maxCount", t.maxCount), e("beforeUpload", t.beforeUpload), e("customRequest", t.customRequest), e(
+      "getOssAccess",
+      t.getOssAccess ?? ((l = o.value) == null ? void 0 : l.getOssAccess)
+    );
+    const O = c(() => p.value === 0), p = u(0);
+    e("uploadingCount", p);
+    const a = u(!0);
+    function A() {
+      a.value = !1, setTimeout(() => {
+        a.value = !0;
       });
     }
-    return l({
-      done: g,
-      clear: v
-    }), (a, T) => (i(), _("div", {
-      class: C(N(p)())
+    return v({
+      done: O,
+      clear: A
+    }), (n, E) => (d(), U("div", {
+      class: T(j(N)())
     }, [
-      o.value ? (i(), S(x(d[t.type]), F(O({ key: 0 }, a.$attrs)), null, 16)) : z("", !0)
+      a.value ? (d(), z(h(_[t.type]), k(B({ key: 0 }, n.$attrs)), null, 16)) : $("", !0)
     ], 2));
   }
 });
 export {
-  H as default
+  ae as default
 };