@aplus-frontend/ui 0.4.34 → 0.4.36

package/es/src/ap-form/hooks/use-watch.d.ts

@@ -2,5 +2,8 @@ import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { ApFormExpose } from '../interface';
 import { Ref } from 'vue';
 type ApFormIns<T> = ApFormExpose<T>;
-declare const useWatch: <ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, form?: Ref<ApFormIns<StoreType> | undefined>) => Ref<ValueType | undefined, ValueType | undefined>;
+type WatchOptions<ValueType> = {
+    initialValue: ValueType;
+};
+export declare function useWatch<ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, formOrOptions?: Ref<ApFormIns<StoreType> | undefined> | WatchOptions<ValueType>, options?: WatchOptions<ValueType>): Ref<ValueType | undefined, ValueType | undefined>;
 export default useWatch;

package/es/src/ap-form/hooks/use-watch.mjs

@@ -1,40 +1,42 @@
-import { useInjectForm as V } from "../context.mjs";
-import { ref as N, watchEffect as A, unref as l, watch as M } from "vue";
-import { isArray as R } from "lodash-unified";
-import { INTERNAL_FORM_INSTANCE_MARK as y } from "../constant.mjs";
-function w(t, e) {
-  return R(e) ? e.reduce((n, u) => n == null ? void 0 : n[u], t) : t == null ? void 0 : t[e];
+import { useInjectForm as M } from "../context.mjs";
+import { ref as R, watchEffect as d, unref as s, watch as y } from "vue";
+import { isArray as E } from "lodash-unified";
+import { INTERNAL_FORM_INSTANCE_MARK as _ } from "../constant.mjs";
+function N(e, t) {
+  return E(t) ? t.reduce((n, l) => n == null ? void 0 : n[l], e) : e == null ? void 0 : e[t];
 }
-function I(t) {
+function V(e) {
   try {
-    return JSON.stringify(t);
+    return JSON.stringify(e);
   } catch {
     return Math.random();
   }
 }
-const F = (t, e) => {
-  const { internalInstance: n, model: u } = V(), i = N();
-  let a = "", o = !0;
-  return A((s) => {
-    var f;
-    const r = ((f = e == null ? void 0 : e.value) == null ? void 0 : f.getInternalInstance(y)) || n;
-    if (!r) {
-      o = !1;
+function W(e, t, n) {
+  const { internalInstance: l, model: v } = M(), g = (n == null ? void 0 : n.initialValue) || (t == null ? void 0 : t.initialValue) || void 0, r = R(g);
+  let u = V(g), h = !0;
+  const i = t && "value" in t ? t : void 0;
+  return d((f) => {
+    var w;
+    const a = ((w = i == null ? void 0 : i.value) == null ? void 0 : w.getInternalInstance(_)) || l;
+    if (!a) {
+      h = !1;
       return;
     }
-    const c = r.registerWatch((S) => {
-      const g = w(S, l(t)), h = I(g);
-      h !== a && (i.value = g, a = h);
-    }, o);
-    s(c);
-  }), M(
-    () => l(t),
-    (s) => {
-      const r = w(l(u), s), c = I(r);
-      c !== a && (i.value = r, a = c);
+    const c = a.registerWatch((A) => {
+      const I = N(A, s(e)), S = V(I);
+      S !== u && (r.value = I, u = S);
+    }, h);
+    f(c);
+  }), y(
+    () => s(e),
+    (f) => {
+      const a = N(s(v), f), c = V(a);
+      c !== u && (r.value = a, u = c);
     }
-  ), i;
-};
+  ), r;
+}
 export {
-  F as default
+  W as default,
+  W as useWatch
 };

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

@@ -4,7 +4,7 @@ import "./item-group/index.vue2.mjs";
 import "./list/index.vue2.mjs";
 import "./search-form/index.vue2.mjs";
 import "./modal-form/index.vue2.mjs";
-import m from "./hooks/use-watch.mjs";
+import { useWatch as m } from "./hooks/use-watch.mjs";
 import "./dependency/index.vue2.mjs";
 import "./set/index.vue2.mjs";
 import "./drawer-form/index.vue2.mjs";

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

@@ -1,4 +1,4 @@
-import { isVNode as se, defineComponent as ie, useSlots as ce, ref as ue, unref as o, shallowRef as M, computed as S, watch as D, cloneVNode as pe, createVNode as a, Fragment as F, createBlock as C, openBlock as m, mergeProps as de, withCtx as E, resolveDynamicComponent as b, createElementBlock as fe, renderList as me } from "vue";
+import { isVNode as se, defineComponent as ie, useSlots as ue, ref as ce, unref as o, shallowRef as M, computed as S, watch as D, cloneVNode as pe, createVNode as a, Fragment as F, createBlock as C, openBlock as m, mergeProps as de, withCtx as E, resolveDynamicComponent as b, createElementBlock as fe, renderList as me } from "vue";
 import { Col as B, Flex as $, Space as he, Button as v, Row as xe } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
@@ -108,8 +108,8 @@ const r = 24, ze = /* @__PURE__ */ ie({
     emit: H
   }) {
     var I;
-    const c = ce(), n = h, G = H, {
-      value: u,
+    const u = ue(), n = h, G = H, {
+      value: c,
       updateValue: J
     } = Fe(n, G, {
       valuePropName: "collapse",
@@ -118,9 +118,9 @@ const r = 24, ze = /* @__PURE__ */ ie({
       b: K
     } = Be("ap-form-search-form"), Q = Re("uiMode"), {
       t: w
-    } = Ae(), g = ue();
+    } = Ae(), g = ce();
     function X() {
-      J(!o(u));
+      J(!o(c));
     }
     function Y() {
       var e, t;
@@ -131,12 +131,12 @@ const r = 24, ze = /* @__PURE__ */ ie({
       n.customReset || (t = (e = g.value) == null ? void 0 : e.resetFields) == null || t.call(e), W(n.onReset);
     }
     let N = [];
-    const R = M(L(c.default())), d = M((I = c.extra) == null ? void 0 : I.call(c)), k = S(() => Math.floor(r / n.countPerRow));
-    D(() => c.default(), (e) => {
+    const R = M(L(u.default())), d = M((I = u.extra) == null ? void 0 : I.call(u)), k = S(() => Math.floor(r / n.countPerRow));
+    D(() => u.default(), (e) => {
       N = R.value, R.value = Se(N, L(e));
     }), D(() => {
       var e;
-      return (e = c.extra) == null ? void 0 : e.call(c);
+      return (e = u.extra) == null ? void 0 : e.call(u);
     }, (e) => {
       d.value = e;
     });
@@ -158,9 +158,8 @@ const r = 24, ze = /* @__PURE__ */ ie({
       let V = 0, j = 0;
       const le = s.map((p, f) => {
         const x = p.props, y = x.span || l;
-        if (V += y, !n.forceExpand && o(u) && V > O) {
+        if (V += y, !n.forceExpand && o(c) && V > O) {
           t.push(pe(p, {
-            class: "ant-form-item-hidden",
             hidden: !0
           }));
           return;
@@ -187,7 +186,7 @@ const r = 24, ze = /* @__PURE__ */ ie({
       }, {
         default: () => [a(q, null, {
           default: () => [a($, {
-            justify: !o(u) && t.lastRowOnlyIncludeActionAndExtra && !(o(d) && n.extraInAction) ? "flex-end" : "space-between"
+            justify: !o(c) && t.lastRowOnlyIncludeActionAndExtra && !(o(d) && n.extraInAction) ? "flex-end" : "space-between"
           }, {
             default: () => [a(he, null, {
               default: () => [a(v, {
@@ -205,19 +204,19 @@ const r = 24, ze = /* @__PURE__ */ ie({
                 onClick: X,
                 icon: a(ye, {
                   style: Q.value === "aplus" ? "color:#B8C3D1" : "color:#BFBFBF",
-                  rotate: o(u) ? 90 : -90
+                  rotate: o(c) ? 90 : -90
                 }, null)
               }, null) : null]
             }), n.extraInAction ? o(d) : null]
           })]
         })]
       }), l = !n.extraInAction && o(d) ? a(B, {
-        span: o(u) ? t.actualExtraSpan : t.defaultExtraSpan,
+        span: o(c) ? t.actualExtraSpan : t.defaultExtraSpan,
         key: "extraNode"
       }, {
         default: () => [a(q, null, {
           default: () => [a($, {
-            justify: !o(u) && (t.defaultExtraSpan === r || t.lastRowOnlyIncludeActionAndExtra) ? "start" : "flex-end"
+            justify: !o(c) && (t.defaultExtraSpan === r || t.lastRowOnlyIncludeActionAndExtra) ? "start" : "flex-end"
           }, be(e = o(d)) ? e : {
             default: () => [e]
           })]
@@ -225,7 +224,7 @@ const r = 24, ze = /* @__PURE__ */ ie({
       }) : null, i = a(B, {
         span: t.defaultExtraSpan
       }, null);
-      return !o(u) && t.lastRowOnlyIncludeActionAndExtra ? a(F, null, [l || i, s]) : a(F, null, [s, l]);
+      return !o(c) && t.lastRowOnlyIncludeActionAndExtra ? a(F, null, [l || i, s]) : a(F, null, [s, l]);
     });
     return z({
       apForm: S(() => o(g))

package/es/src/ap-modal/enums/modalMessage.d.ts

@@ -0,0 +1,6 @@
+export declare enum ModalMessage {
+    /**
+     * 弹框不需要关闭
+     */
+    NOT_NEED_CLOSE = "Info: [aplus-ui: ApModal.createModalStream] The modal does not need to be closed"
+}

package/es/src/ap-modal/enums/modalMessage.mjs

@@ -0,0 +1,4 @@
+var o = /* @__PURE__ */ ((e) => (e.NOT_NEED_CLOSE = "Info: [aplus-ui: ApModal.createModalStream] The modal does not need to be closed", e))(o || {});
+export {
+  o as ModalMessage
+};

package/es/src/ap-modal/index.d.ts

@@ -1,8 +1,9 @@
 import { Modal as _Modal } from '@aplus-frontend/antdv';
-import { CreateModalFunc } from './interface';
+import { CreateModalFunc, CreateModalStreamFunc } from './interface';
 export * from './interface';
 type ApModalMixedProps = typeof _Modal & {
     createModal: CreateModalFunc;
+    createModalStream: CreateModalStreamFunc;
 };
 declare const ApModal: ApModalMixedProps;
 export { ApModal };

package/es/src/ap-modal/index.mjs

@@ -2,8 +2,10 @@ import { Modal as r } from "@aplus-frontend/antdv";
 import "./utils/index.mjs";
 import "./interface.mjs";
 import { createModal as a } from "./utils/createModal.mjs";
+import { createModalStream as t } from "./utils/createModalStream.mjs";
 const o = r;
 o.createModal = a;
+o.createModalStream = t;
 o.name = "ApModal";
 export {
   o as ApModal

package/es/src/ap-modal/interface.d.ts

@@ -1,16 +1,141 @@
-import { ModalProps } from '@aplus-frontend/antdv';
+import { ModalProps, ModalFuncProps } from '@aplus-frontend/antdv';
+import { ModalFunc } from '@aplus-frontend/antdv/lib/modal/confirm';
 export type CreateModalFuncProps<ContentRecord = any> = Omit<ModalProps, 'open' | 'onUpdate:open' | 'destroyOnClose' | 'onCancel' | 'onOk' | 'getContainer' | 'icon'> & Partial<{
+    /**
+     * 点击取消回调
+     * @param params content组件内使用defineExpose导出的对象
+     * @returns
+     */
     onCancel: (params: ContentRecord) => any | Promise<any>;
+    /**
+     * 点击确定回调
+     * @param params content组件内使用defineExpose导出的对象
+     * @returns
+     */
     onOk: (params: ContentRecord) => any | Promise<any>;
+    /**
+     * 指定弹框挂载的 HTML 节点
+     */
     getContainer: HTMLElement;
+    /**
+     * 内容
+     */
     content: any;
+    /**
+     * 关闭时是否销毁弹框
+     */
     destroyOnClose: boolean;
+    /**
+     * 自适应高度
+     */
     wrapperOffset: boolean | number;
 }>;
 export type CreateModalFuncReturn = {
+    /**
+     * 销毁弹框
+     * @returns
+     */
     destroy: () => void;
+    /**
+     * 更新弹框 props 属性
+     * @param newConfig
+     * @returns
+     */
     update: (newConfig: CreateModalFuncProps) => void;
+    /**
+     * 打开弹框
+     * @returns
+     */
     open: () => void;
+    /**
+     * 关闭弹框,不销毁
+     * @returns
+     */
     close: () => void;
 };
 export type CreateModalFunc = (props: CreateModalFuncProps) => CreateModalFuncReturn;
+export type ModalStreamNextFunc<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = (option: {
+    /**
+     * 下一步弹框的id
+     */
+    modalId?: string;
+    /**
+     * 下一步弹框传递的参数
+     */
+    params?: any;
+    /**
+     * 本次弹框关闭前的回调,createModal默认关闭弹框,其他弹框类型默认销毁弹框,调用弹框实例的open方法可以不关闭弹框
+     */
+    handleCurrentModal?: (
+    /**
+     * 本次弹框的实例方法
+     */
+    modalExample: ModalStreamTypeExample[ModalType]) => any | Promise<any>;
+}) => any | Promise<any>;
+export type ModalStreamType = {
+    createModal: CreateModalStream<'createModal'>;
+    info: ModalFuncStream<'info'>;
+    success: ModalFuncStream<'success'>;
+    error: ModalFuncStream<'error'>;
+    warning: ModalFuncStream<'warning'>;
+    confirm: ModalFuncStream<'confirm'>;
+};
+export type ModalStreamFuncReturn = ReturnType<ModalFunc> & {
+    open: () => void;
+};
+export type ModalStreamTypeExample = {
+    createModal: CreateModalFuncReturn;
+    info: ModalStreamFuncReturn;
+    success: ModalStreamFuncReturn;
+    error: ModalStreamFuncReturn;
+    warning: ModalStreamFuncReturn;
+    confirm: ModalStreamFuncReturn;
+};
+export type ModalFuncStream<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = Omit<ModalFuncProps, 'onOk' | 'onCancel'> & {
+    /**
+     * 点击确定回调
+     * @param next 下一步
+     * @returns
+     */
+    onOk?: (next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+    /**
+     * 点击取消回调
+     * @param next 下一步
+     * @returns
+     */
+    onCancel?: (next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+};
+export type CreateModalStream<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = Omit<CreateModalFuncProps, 'destroyOnClose' | 'onOk' | 'onCancel'> & {
+    /**
+     * 点击确定回调
+     * * @param params content组件内使用defineExpose导出的对象
+     * @param next 下一步
+     * @returns
+     */
+    onOk?: (params: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+    /**
+     * 点击取消回调
+     * * @param params content组件内使用defineExpose导出的对象
+     * @param next 下一步
+     * @returns
+     */
+    onCancel?: (params: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+};
+export type ModalStreamTypeKey = keyof ModalStreamType;
+export type CreateModalStreamProps<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = ModalType extends ModalStreamTypeKey ? {
+    /**
+     * 弹框id
+     */
+    modalId: string;
+    /**
+     * 弹框类型
+     */
+    modalType?: ModalType;
+    /**
+     * 弹框属性
+     * @param params 上一步弹框传递的参数
+     * @returns
+     */
+    props: (params: any) => Promise<ModalStreamType[ModalType]>;
+} : never;
+export type CreateModalStreamFunc<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = (streamList: CreateModalStreamProps<ModalType>[], firstModalId?: string) => void;

package/es/src/ap-modal/utils/createModalStream.d.ts

@@ -0,0 +1,2 @@
+import { CreateModalStreamFunc } from '../interface';
+export declare const createModalStream: CreateModalStreamFunc;

package/es/src/ap-modal/utils/createModalStream.mjs

@@ -0,0 +1,99 @@
+import { isValid as L } from "@aplus-frontend/utils";
+import { createModal as P } from "./createModal.mjs";
+import { Modal as V } from "@aplus-frontend/antdv";
+import { ModalMessage as S } from "../enums/modalMessage.mjs";
+const G = (_, F) => {
+  var O;
+  const l = F ?? (Array.isArray(_) ? (O = _[0]) == null ? void 0 : O.modalId : void 0), d = /* @__PURE__ */ new Map();
+  let T, u, E = 1e3;
+  const y = async ({
+    modalId: a,
+    params: o,
+    handleCurrentModal: t
+  }) => {
+    T = o;
+    const w = _.find((n) => n.modalId === a);
+    let s = !1;
+    if (u) {
+      const n = d.get(u), i = {
+        ...n,
+        destroy: () => {
+          var f;
+          (f = n == null ? void 0 : n.destroy) == null || f.call(n), d.delete(u);
+        },
+        open: () => {
+          s = !0;
+        }
+      };
+      await (t == null ? void 0 : t(i));
+    }
+    return w && setTimeout(() => {
+      k(w);
+    }), s;
+  }, I = () => {
+    var a;
+    for (const [o, t] of d)
+      (a = t == null ? void 0 : t.destroy) == null || a.call(t);
+  }, k = async (a) => {
+    var g, A, C, z;
+    const {
+      modalId: o,
+      modalType: t = "createModal",
+      props: w
+    } = a;
+    u = o;
+    const s = d.get(o), n = await (w == null ? void 0 : w(T));
+    E = Math.max((n == null ? void 0 : n.zIndex) ?? 0, E), E += 1;
+    let i, f = !1;
+    if (t === "createModal") {
+      const e = n, m = async (r) => (f = !0, await y(r));
+      i = {
+        ...e,
+        destroyOnClose: !1,
+        zIndex: E,
+        onOk: async (r) => {
+          var N;
+          const c = await ((N = e == null ? void 0 : e.onOk) == null ? void 0 : N.call(e, r, m));
+          if (f || I(), c)
+            throw new Error(S.NOT_NEED_CLOSE);
+        },
+        onCancel: async (r) => {
+          var N;
+          const c = await ((N = e == null ? void 0 : e.onCancel) == null ? void 0 : N.call(e, r, m));
+          if (f || I(), c)
+            throw new Error(S.NOT_NEED_CLOSE);
+        }
+      };
+    } else {
+      const e = n, m = async (r) => (f = !0, await y(r));
+      i = {
+        ...e,
+        zIndex: E,
+        onOk: async () => {
+          var c;
+          const r = await ((c = e == null ? void 0 : e.onOk) == null ? void 0 : c.call(e, m));
+          if (f || I(), r)
+            throw new Error(S.NOT_NEED_CLOSE);
+        },
+        onCancel: async () => {
+          var c;
+          const r = await ((c = e == null ? void 0 : e.onCancel) == null ? void 0 : c.call(e, m));
+          if (f || I(), r)
+            throw new Error(S.NOT_NEED_CLOSE);
+        }
+      };
+    }
+    if (s) {
+      s == null || s.update(i), (g = s == null ? void 0 : s.open) == null || g.call(s);
+      return;
+    } else if (t === "createModal") {
+      const e = P(i);
+      (A = e == null ? void 0 : e.open) == null || A.call(e), d.set(o, e);
+    } else
+      (z = (C = V) == null ? void 0 : C[t]) == null || z.call(C, i);
+  }, D = _.find((a) => L(l) && a.modalId === l);
+  D !== void 0 && k(D);
+};
+export {
+  G as createModalStream
+};

package/es/src/ap-modal/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './createModal';
+export * from './createModalStream';

package/es/src/ap-modal/utils/index.mjs

@@ -1,4 +1,6 @@
-import { createModal as r } from "./createModal.mjs";
+import { createModal as o } from "./createModal.mjs";
+import { createModalStream as t } from "./createModalStream.mjs";
 export {
-  r as createModal
+  o as createModal,
+  t as createModalStream
 };

package/es/src/ap-table/components/dynamic-component/index.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as t, createElementBlock as o, openBlock as n, Fragment as r, createBlock as a, createTextVNode as s, resolveDynamicComponent as c, toDisplayString as m } from "vue";
-const u = /* @__PURE__ */ t({
+import { defineComponent as n, createBlock as o, openBlock as t, resolveDynamicComponent as r } from "vue";
+const s = /* @__PURE__ */ n({
   name: "ApTableDynamicComponent",
   inheritAttrs: !1,
   __name: "index",
@@ -7,12 +7,9 @@ const u = /* @__PURE__ */ t({
     customRender: { type: Function }
   },
   setup(p) {
-    return (e, l) => (n(), o(r, null, [
-      (n(), a(c(e.customRender(e.$attrs)))),
-      s(" " + m(console.log(e.$attrs)), 1)
-    ], 64));
+    return (e, a) => (t(), o(r(e.customRender(e.$attrs))));
   }
 });
 export {
-  u as default
+  s as default
 };

package/es/src/ap-table/utils.d.ts

@@ -1010,10 +1010,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                         };
                         parser: {
                             type: PropType<(displayValue: string) => ValueType>;
-                            default: (displayValue: string) => **
-                             * 通常情况下，表格渲染是不需要请求网络数据的，因此这里删掉request，
-                             * 如果需要做映射，可以在外部发起一次网络请求，然后使用valueEnum设置匹配枚举。
-                             */).ValueType;
+                            default: (displayValue: string) => ValueType;
                         };
                         formatter: {
                             type: PropType<(value: ValueType, info: {