@aplus-frontend/ui 7.1.1 → 7.2.0

package/es/src/business/ap-image/ApImage.vue2.mjs

@@ -1,16 +1,16 @@
-import { defineComponent as S, computed as n, ref as I, watchEffect as U, createBlock as p, openBlock as l, unref as a, mergeProps as f, withCtx as j, renderSlot as B, normalizeProps as E, guardReactiveProps as L, createElementVNode as g, normalizeClass as D, createElementBlock as M, Fragment as P, renderList as R, resolveDynamicComponent as T, createVNode as x } from "vue";
-import { Image as z } from "@aplus-frontend/antdv";
-import { DownloadOutlined as V } from "@ant-design/icons-vue";
-import { injectLocaleToOss as W, getOssInstance as G, getSignatureUrl as $ } from "./hooks/useOss.mjs";
+import { defineComponent as M, computed as n, ref as S, watchEffect as U, createBlock as p, openBlock as l, unref as a, mergeProps as f, withCtx as j, renderSlot as B, normalizeProps as E, guardReactiveProps as L, createElementVNode as g, normalizeClass as x, createElementBlock as D, Fragment as P, renderList as R, resolveDynamicComponent as T, createVNode as z } from "vue";
+import { Image as V } from "@aplus-frontend/antdv";
+import { DownloadOutlined as W } from "@ant-design/icons-vue";
+import { injectLocaleToOss as G, getOssInstance as $, getSignatureUrl as q } from "./hooks/useOss.mjs";
 import "../../config-provider/index.mjs";
-import q from "./style/index.mjs";
-import H from "./imgs/admin-fallback.jpg.mjs";
-import J from "./imgs/aplus-fallback.jpg.mjs";
-import { omit as K } from "lodash-unified";
-import { useNamespace as Q } from "../../config-provider/hooks/use-namespace.mjs";
+import H from "./style/index.mjs";
+import J from "./imgs/admin-fallback.jpg.mjs";
+import K from "./imgs/aplus-fallback.jpg.mjs";
+import { omit as Q } from "lodash-unified";
+import { useNamespace as X } from "../../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as c } from "../../config-provider/hooks/use-global-config.mjs";
-import { useLocale as X } from "../../config-provider/hooks/use-locale.mjs";
-const me = /* @__PURE__ */ S({
+import { useLocale as Y } from "../../config-provider/hooks/use-locale.mjs";
+const ue = /* @__PURE__ */ M({
   __name: "ApImage",
   props: {
     getOssAccess: {},
@@ -20,20 +20,23 @@ const me = /* @__PURE__ */ S({
     fallback: {},
     src: {},
     fileName: {},
+    uiMode: {},
     preview: { type: [Boolean, Object], default: !0 }
   },
-  setup(b) {
-    const { b: i } = Q("ap-image"), m = q("ap-image"), e = b, u = {
-      aplus: J,
-      admin: H
-    }, v = c("uiMode"), h = c("apUpload"), d = c(
+  setup(v) {
+    const { b: i } = X("ap-image"), m = H("ap-image"), e = v, u = {
+      aplus: K,
+      admin: J
+    }, b = c("apImage", { uiMode: "aplus" }), h = c("apUpload"), d = c(
       "downloadCenterTriggerConfig"
-    ), { t: k, lang: w } = X(), C = n(
+    ), k = n(
+      () => e.uiMode || b.value?.uiMode
+    ), { t: w, lang: C } = Y(), O = n(
       () => e.getOssAccess || h.value?.getOssAccess
-    ), O = n(
-      () => u[v.value] || u.aplus
-    ), y = n(() => e?.fallback || O.value), s = I("");
-    W(k, w), U(async () => {
+    ), y = n(
+      () => u[k.value] || u.aplus
+    ), A = n(() => e?.fallback || y.value), s = S("");
+    G(w, C), U(async () => {
       if (!e?.src) {
         s.value = "";
         return;
@@ -43,55 +46,55 @@ const me = /* @__PURE__ */ S({
         return;
       }
       try {
-        const t = await G(C.value), o = await $({
+        const t = await $(O.value), r = await q({
           oss: t,
           fileName: e.src
         });
-        o && (s.value = o);
+        r && (s.value = r);
       } catch {
         s.value = "";
       }
     });
-    async function A() {
+    async function N() {
       if (!e?.src)
         return;
-      const t = e.src, o = e.fileName ?? e.src;
+      const t = e.src, r = e.fileName ?? e.src;
       if (!e.src?.startsWith("Frontend-Upload")) {
-        N(t, o);
+        I(t, r);
         return;
       }
       if (d.value?.trigger) {
-        let r = [
+        let o = [
           {
             objectName: t,
-            fileName: o
+            fileName: r
           }
         ];
-        await d.value?.trigger(r);
+        await d.value?.trigger(o);
       }
     }
-    const N = (t, o) => {
-      const r = document.createElement("a");
-      r.href = t, r.rel = "noopener noreferrer", r.setAttribute("download", o), document.body.appendChild(r), r.click(), document.body.removeChild(r);
+    const I = (t, r) => {
+      const o = document.createElement("a");
+      o.href = t, o.rel = "noopener noreferrer", o.setAttribute("download", r), document.body.appendChild(o), o.click(), document.body.removeChild(o);
     };
-    return (t, o) => (l(), p(a(z), f({
+    return (t, r) => (l(), p(a(V), f({
       class: [a(i)(), a(m)]
     }, {
-      ...a(K)(e, ["src", "getOssAccess"]),
-      fallback: y.value,
+      ...a(Q)(e, ["src", "getOssAccess"]),
+      fallback: A.value,
       src: s.value
     }), {
-      toolbarRender: j((r) => [
-        B(t.$slots, "toolbarRender", E(L({ ...r })), () => [
+      toolbarRender: j((o) => [
+        B(t.$slots, "toolbarRender", E(L({ ...o })), () => [
           g("div", {
-            class: D([a(i)("toolbar"), a(m)])
+            class: x([a(i)("toolbar"), a(m)])
           }, [
-            (l(!0), M(P, null, R(r.originalNodes, (_, F) => (l(), p(T(_), f({ ref_for: !0 }, e, { key: F }), null, 16))), 128)),
+            (l(!0), D(P, null, R(o.originalNodes, (_, F) => (l(), p(T(_), f({ ref_for: !0 }, e, { key: F }), null, 16))), 128)),
             g("div", {
               class: "ant-image-preview-operations-operation",
-              onClick: A
+              onClick: N
             }, [
-              x(a(V))
+              z(a(W))
             ])
           ], 2)
         ])
@@ -101,5 +104,5 @@ const me = /* @__PURE__ */ S({
   }
 });
 export {
-  me as default
+  ue as default
 };

package/es/src/business/ap-image/interface.d.ts

@@ -1,4 +1,5 @@
 import { accessCreate } from '@aplus-frontend/oss';
+import { UiModeType } from '../../config-provider';
 export interface ApImageProps {
     getOssAccess?: () => Promise<accessCreate>;
     width?: number | string;
@@ -7,6 +8,7 @@ export interface ApImageProps {
     fallback?: string;
     src?: string;
     fileName?: string;
+    uiMode?: UiModeType;
     preview?: boolean | {
         visible?: boolean;
         onVisibleChange?: (visible: boolean, prevVisible: boolean) => void;

package/es/src/business/ap-title/ApTitle.vue2.mjs

@@ -1,11 +1,11 @@
-import { defineComponent as g, computed as h, createElementBlock as a, openBlock as o, normalizeClass as l, unref as t, createElementVNode as r, renderSlot as n, Fragment as y, createBlock as C, createCommentVNode as k, toDisplayString as v, withCtx as I, createVNode as M, normalizeStyle as S } from "vue";
+import { defineComponent as y, computed as a, createElementBlock as n, openBlock as l, normalizeClass as r, unref as t, createElementVNode as i, renderSlot as p, Fragment as C, createBlock as M, createCommentVNode as v, toDisplayString as k, withCtx as I, createVNode as S, normalizeStyle as T } from "vue";
 import { Tooltip as $ } from "@aplus-frontend/antdv";
 import { QuestionCircleOutlined as N } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
-import B from "./style/index.mjs";
-import { useNamespace as T } from "../../config-provider/hooks/use-namespace.mjs";
+import A from "./style/index.mjs";
+import { useNamespace as B } from "../../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as V } from "../../config-provider/hooks/use-global-config.mjs";
-const O = /* @__PURE__ */ g({
+const O = /* @__PURE__ */ y({
   name: "ApTitle",
   __name: "ApTitle",
   props: {
@@ -13,39 +13,42 @@ const O = /* @__PURE__ */ g({
     helpMessage: { default: "" },
     helpIconColor: { default: "" },
     placement: { default: "top" },
-    trigger: { default: "hover" }
+    trigger: { default: "hover" },
+    uiMode: {}
   },
-  setup(p) {
-    const s = p, { b: m, e: i, m: u } = T("ap-title"), c = B("ap-title"), f = V("uiMode", "aplus"), d = h(() => s.helpIconColor ? {
-      color: `${s.helpIconColor}`
+  setup(m) {
+    const o = m, { b: u, e: s, m: c } = B("ap-title"), d = A("ap-title"), f = V("apTitle", { uiMode: "aplus" }), g = a(
+      () => o.uiMode || f.value?.uiMode
+    ), h = a(() => o.helpIconColor ? {
+      color: `${o.helpIconColor}`
     } : {});
-    return (e, b) => (o(), a("div", {
-      class: l([t(m)(), `${t(u)(t(f))}`, t(c)])
+    return (e, b) => (l(), n("div", {
+      class: r([t(u)(), `${t(c)(g.value)}`, t(d)])
     }, [
-      r("div", {
-        class: l(t(i)("prefix"))
+      i("div", {
+        class: r(t(s)("prefix"))
       }, [
-        e.$slots.prefix ? n(e.$slots, "prefix", { key: 0 }) : (o(), a(y, { key: 1 }, [
-          r("span", null, v(e.title), 1),
-          e.helpMessage ? (o(), C(t($), {
+        e.$slots.prefix ? p(e.$slots, "prefix", { key: 0 }) : (l(), n(C, { key: 1 }, [
+          i("span", null, k(e.title), 1),
+          e.helpMessage ? (l(), M(t($), {
             key: 0,
             title: e.helpMessage,
             placement: e.placement,
             trigger: e.trigger
           }, {
             default: I(() => [
-              M(t(N), {
-                style: S(d.value)
+              S(t(N), {
+                style: T(h.value)
               }, null, 8, ["style"])
             ]),
             _: 1
-          }, 8, ["title", "placement", "trigger"])) : k("", !0)
+          }, 8, ["title", "placement", "trigger"])) : v("", !0)
         ], 64))
       ], 2),
-      r("div", {
-        class: l(t(i)("suffix"))
+      i("div", {
+        class: r(t(s)("suffix"))
       }, [
-        n(e.$slots, "suffix")
+        p(e.$slots, "suffix")
       ], 2)
     ], 2));
   }

package/es/src/business/ap-title/interface.d.ts

@@ -1,3 +1,4 @@
+import { UiModeType } from '../../config-provider';
 /**
  * ApTitle Props 属性类型声明
  */
@@ -22,4 +23,5 @@ export interface ApTitleProps {
      * 气泡触发行为 默认hover
      */
     trigger?: 'hover' | 'focus' | 'click' | 'contextmenu';
+    uiMode?: UiModeType;
 }

package/es/src/business/hooks/index.d.ts

@@ -1,5 +1,3 @@
 export * from './usePageListApTable';
-export * from './useTableRefresh';
 export * from './usePageListApGrid';
-export * from './useGridRefresh';
 export * from './usePageListAgGrid';

package/es/src/business/hooks/index.mjs

@@ -1,12 +1,8 @@
 import { usePageListApTable as o } from "./usePageListApTable.mjs";
-import { useTableRefresh as t } from "./useTableRefresh.mjs";
-import { usePageListApGrid as p } from "./usePageListApGrid.mjs";
-import { useGridRefresh as a } from "./useGridRefresh.mjs";
-import { usePageListAgGrid as u } from "./usePageListAgGrid.mjs";
+import { usePageListApGrid as t } from "./usePageListApGrid.mjs";
+import { usePageListAgGrid as p } from "./usePageListAgGrid.mjs";
 export {
-  a as useGridRefresh,
-  u as usePageListAgGrid,
-  p as usePageListApGrid,
-  o as usePageListApTable,
-  t as useTableRefresh
+  p as usePageListAgGrid,
+  t as usePageListApGrid,
+  o as usePageListApTable
 };

package/es/src/business/hooks/usePageListApGrid.d.ts

@@ -1,4 +1,3 @@
-import { UseTableRefreshOption } from '..';
 import { ApGridExpose, ApGridProps } from '../../ap-grid';
 export interface UsePageListApGrid extends ApGridProps {
     /** 是否显示默认的行选择配置
@@ -18,7 +17,7 @@ export interface UsePageListApGrid extends ApGridProps {
     /**
      * 表格刷新相关
      */
-    tableRefresh?: boolean | Omit<UseTableRefreshOption, 'apTableRef'>;
+    tableRefresh?: boolean | (() => boolean);
     /** 是否需要在deactivated的时候清空数据
      * @default true
      */

package/es/src/business/hooks/usePageListApGrid.mjs

@@ -1,75 +1,71 @@
-import "../index.mjs";
-import { merge as i, cloneDeep as F } from "lodash-unified";
+import { isFunction as F, merge as l, cloneDeep as w } from "lodash-unified";
 import { ref as R } from "vue";
-import { useKeepAliveFlag as w } from "./useKeepAliveFlag.mjs";
-import { useTableRefresh as V } from "./useTableRefresh.mjs";
-function W(a) {
+import { useKeepAliveFlag as V } from "./useKeepAliveFlag.mjs";
+function B(u) {
   const r = R(null), {
-    isShowRowSelection: c = !0,
+    isShowRowSelection: d = !0,
     clearSelectionOnRequest: f = !0,
     transformSearchFormValues: o,
-    api: s,
-    tableRefresh: d = !0,
-    virtual: m,
-    clearDataOnDeactivated: p = !0,
-    ...h
-  } = a || {};
-  let l = null;
-  const n = () => {
+    api: a,
+    tableRefresh: s = !0,
+    virtual: p,
+    clearDataOnDeactivated: m = !0,
+    ...v
+  } = u || {};
+  let n = null;
+  const c = () => {
     r.value?.rowSelection?.clearAll();
-  };
-  V({
-    ...b(d),
-    apTableRef: r
-  });
-  const u = () => {
+  }, i = () => {
     r.value?.submitWith(!0);
-  }, v = () => {
+  }, S = () => {
     r.value?.reset();
-  }, { isDeactivated: S } = w({
-    afterDeactivated: u
+  }, { isDeactivated: h } = V({
+    afterActivated() {
+      (F(s) ? s() : s) && i();
+    },
+    afterDeactivated: i
   });
-  return [i(
+  return [l(
     {
       // scroll，tableLayout，columnResizable设置表格可拖动
       scroll: { x: "100%", y: "100%" },
       columnResizable: !0,
-      request: s ? async (e) => {
-        if (S() && p)
+      request: a ? async (e) => {
+        if (h() && m)
           return {
             data: [],
             total: 0
           };
-        l = e.sort;
+        n = e.sort;
         const t = o ? o(e) : e;
-        if (!s) throw new Error("api is not defined");
-        const { records: g, total: A } = await s(t);
-        return f && n(), {
+        if (!a) throw new Error("api is not defined");
+        const { records: g, total: A } = await a(t);
+        return f && c(), {
           data: g,
           total: A
         };
       } : void 0,
-      rowSelection: c ? {
+      rowSelection: d ? {
         fixed: "left",
         columnWidth: 38
       } : void 0,
       ref(e) {
         r.value = e;
       },
-      virtual: i(
+      virtual: l(
         {
           oSize: 20,
           y: 20
         },
-        m
+        p
       ),
       // 新UI规范，需要都添加分割线
       card: !0
     },
-    h
+    v
   ), {
-    reload: u,
-    reset: v,
+    reload: i,
+    reset: S,
     getSearchFormValues: (e = !0) => {
       const t = r.value?.getSearchFormValues(!!e) || {};
       return o ? o(t) : t;
@@ -77,16 +73,11 @@ function W(a) {
     getApGridInstance: () => r.value,
     getSearchFormValuesAndSorted: (e = !0) => {
       const t = r.value?.getSearchFormValues(!!e) || {};
-      return t.sort = l && F(l), o ? o(t) : t;
+      return t.sort = n && w(n), o ? o(t) : t;
     },
-    clearSelection: n
+    clearSelection: c
   }];
 }
-function b(a) {
-  return a === !0 ? {} : a === !1 ? {
-    refreshBefore: () => !1
-  } : a;
-}
 export {
-  W as usePageListApGrid
+  B as usePageListApGrid
 };

package/es/src/business/hooks/usePageListApTable.d.ts

@@ -1,5 +1,4 @@
 import { ApTableProps } from '../../';
-import { UseTableRefreshOption } from './useTableRefresh';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
 import { InternalPagingType } from '../../ap-table/hooks/use-table-paging-ng';
@@ -22,7 +21,7 @@ export interface UsePageListApTable extends ApTableProps {
     /**
      * 表格刷新相关
      */
-    tableRefresh?: boolean | Omit<UseTableRefreshOption, 'apTableRef'>;
+    tableRefresh?: boolean | (() => boolean);
 }
 /**
  * 集成了列表页面的ApTable的默认配置

package/es/src/business/hooks/usePageListApTable.mjs

@@ -1,29 +1,42 @@
-import { merge as d, cloneDeep as h } from "lodash-unified";
-import { ref as S } from "vue";
-import { useTableRefresh as b } from "./useTableRefresh.mjs";
-import { warning as g } from "../../utils/warning.mjs";
-function v(o) {
-  return o === !0 ? {} : o === !1 ? {
-    refreshBefore: () => !1
-  } : o;
-}
-function O(o) {
-  const r = S(null), {
-    isShowRowSelection: u = !0,
-    clearSelectionOnRequest: i = !0,
-    transformSearchFormValues: a,
-    api: s,
-    tableRefresh: f = !1,
-    ...m
-  } = o || {};
+import { isFunction as g, merge as v, cloneDeep as b } from "lodash-unified";
+import { ref as A } from "vue";
+import { warning as F } from "../../utils/warning.mjs";
+import { useKeepAliveFlag as w } from "./useKeepAliveFlag.mjs";
+function k(u) {
+  const r = A(null), {
+    isShowRowSelection: f = !0,
+    clearSelectionOnRequest: m = !0,
+    transformSearchFormValues: o,
+    api: a,
+    tableRefresh: s = !1,
+    ...p
+  } = u || {};
   let l = null;
   const c = () => {
     r.value?.rowSelection?.clearAll();
+  }, d = async (e) => {
+    l = e.sort;
+    const t = o ? o(e) : e;
+    try {
+      if (!a) throw new Error("api is not defined");
+      const { records: n, total: S } = await a(t);
+      return m && c(), {
+        data: n,
+        total: S
+      };
+    } catch (n) {
+      return F(!1, n), {
+        data: [],
+        total: 0
+      };
+    }
   };
-  return b({
-    ...v(f),
-    apTableRef: r
-  }), [d(
+  w({
+    afterActivated() {
+      (g(s) ? s() : s) && i();
+    }
+  });
+  const h = v(
     {
       // scroll，tableLayout，columnResizable设置表格可拖动
       scroll: { x: "100%", y: "100%" },
@@ -31,24 +44,8 @@ function O(o) {
       columnResizable: !0,
       // 表格header吸顶效果
       class: "ap-table--sticky",
-      request: s ? async (e) => {
-        l = e.sort;
-        const t = a ? a(e) : e;
-        try {
-          if (!s) throw new Error("api is not defined");
-          const { records: n, total: p } = await s(t);
-          return i && c(), {
-            data: n,
-            total: p
-          };
-        } catch (n) {
-          return g(!1, n), {
-            data: [],
-            total: 0
-          };
-        }
-      } : void 0,
-      rowSelection: u ? {
+      request: a ? d : void 0,
+      rowSelection: f ? {
         mode: "internal",
         fixed: "left",
         columnWidth: 50
@@ -59,26 +56,27 @@ function O(o) {
       // 新UI规范，需要都添加分割线
       card: !0
     },
-    m
-  ), {
-    reload: () => {
-      r.value?.submit();
-    },
+    p
+  ), i = () => {
+    r.value?.submit();
+  };
+  return [h, {
+    reload: i,
     reset: () => {
       r.value?.reset();
     },
     getSearchFormValues: (e) => {
       const t = r.value?.getSearchFormValues(e) || {};
-      return a ? a(t) : t;
+      return o ? o(t) : t;
     },
     getApTableInstance: () => r.value,
     getSearchFormValuesAndSorted: (e) => {
       const t = r.value?.getSearchFormValues(e) || {};
-      return t.sort = l && h(l), a ? a(t) : t;
+      return t.sort = l && b(l), o ? o(t) : t;
     },
     clearSelection: c
   }];
 }
 export {
-  O as usePageListApTable
+  k as usePageListApTable
 };

package/es/src/config-provider/config-provider-props.d.ts

@@ -1,9 +1,9 @@
 import { ExtractPropTypes, PropType } from 'vue';
 import { LocaleType } from '../locale/interface';
-import { ApiType, ApUploadConfig, ApDescriptionsConfig, ValueTypeRenderConfig, downloadCenterTriggerConfig, ExportField, SearchFormGlobalConfig } from './constants';
+import { ApiType, ApUploadConfig, ApDescriptionsConfig, ValueTypeRenderConfig, downloadCenterTriggerConfig, ExportField, SearchFormGlobalConfig, UiModeType } from './constants';
 import { ApGridProps } from '../ap-grid';
 import { AgGridProps } from '../ag-grid';
-import { ViewCacheOption } from '../business';
+import { ApImageProps, ApTitleProps, ViewCacheOption } from '../business';
 import { FullToken } from '../design-token/interface';
 import { RecursivePartial } from '../type';
 import { default as __DTS_DEFAULT_0__ } from '@aplus-frontend/antdv/es/config-provider/renderEmpty';
@@ -14,6 +14,11 @@ import { ButtonSize } from '@aplus-frontend/antdv/es/button';
 import { ThemeConfig, InputConfig, PaginationConfig, FormConfig, SelectConfig, CascaderConfig, DatePickerConfig, RangePickerConfig, TreeSelectConfig, TextAreaConfig, InputNumberConfig, MentionsConfig, TimePickerConfig, CardConfig } from '@aplus-frontend/antdv/es/config-provider/context';
 type ApGridConfig = Pick<ApGridProps, 'rowSelection'>;
 type AgGridConfig = Pick<AgGridProps, 'rowSelection'>;
+type ApProCardConfig = {
+    uiMode?: UiModeType;
+};
+type ApImageConfig = Pick<ApImageProps, 'uiMode'>;
+type ApTitleConfig = Pick<ApTitleProps, 'uiMode'>;
 export declare const configProviderProps: () => {
     iconPrefixCls: StringConstructor;
     getTargetContainer: {
@@ -152,6 +157,15 @@ export declare const configProviderProps: () => {
     agGrid: {
         type: PropType<AgGridConfig>;
     };
+    apProCard: {
+        type: PropType<ApProCardConfig>;
+    };
+    apImage: {
+        type: PropType<ApImageConfig>;
+    };
+    apTitle: {
+        type: PropType<ApTitleConfig>;
+    };
     /**
      * @description aplus-ui的locale
      */
@@ -171,8 +185,11 @@ export declare const configProviderProps: () => {
         type: PropType<ApiType>;
         default: () => {};
     };
+    /**
+     * @deprecated 已废弃，请使用各自组件的uiMode属性
+     */
     uiMode: {
-        type: PropType<"aplus" | "admin">;
+        type: PropType<UiModeType>;
     };
     apUpload: {
         type: PropType<ApUploadConfig>;

package/es/src/config-provider/config-provider-props.mjs

@@ -5,6 +5,15 @@ const t = () => ({
   },
   agGrid: {
     type: Object
+  },
+  apProCard: {
+    type: Object
+  },
+  apImage: {
+    type: Object
+  },
+  apTitle: {
+    type: Object
   }
 }), o = () => ({
   /**
@@ -26,6 +35,9 @@ const t = () => ({
     type: Object,
     default: () => ({})
   },
+  /**
+   * @deprecated 已废弃，请使用各自组件的uiMode属性
+   */
   uiMode: {
     type: String
   },