@done-coding/admin-core 0.1.1-alpha.0 → 0.1.1-alpha.1

package/es/components/misc/AutoRefresh.vue.mjs

@@ -1,7 +1,7 @@
 import o from "./AutoRefresh.vue2.mjs";
 /* empty css                  */
 import t from "../../_virtual/_plugin-vue_export-helper.mjs";
-const m = /* @__PURE__ */ t(o, [["__scopeId", "data-v-b734f05f"]]);
+const m = /* @__PURE__ */ t(o, [["__scopeId", "data-v-4446ddf0"]]);
 export {
   m as default
 };

package/es/components/misc/AutoRefresh.vue2.mjs

@@ -1,51 +1,55 @@
-import { ElInputNumber as x, ElSwitch as M } from "element-plus/es";
+import { ElInputNumber as y, ElSwitch as M } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/switch/style/css";
 import "element-plus/es/components/input-number/style/css";
-import { defineComponent as N, useModel as m, watch as n, openBlock as i, createElementBlock as d, Fragment as b, createElementVNode as f, createVNode as p, createCommentVNode as k, mergeModels as w } from "vue";
-import { useTimeout as B } from "../../hooks/timeout.mjs";
+import { defineComponent as N, useModel as f, computed as w, watch as x, openBlock as p, createElementBlock as c, Fragment as B, createElementVNode as v, createVNode as V, createCommentVNode as R, mergeModels as k } from "vue";
+import { useTimeout as F } from "../../hooks/timeout.mjs";
 import { useActivatedExec as T } from "../../hooks/activated.mjs";
-const y = { class: "auto-refresh" }, F = /* @__PURE__ */ N({
+const g = { class: "auto-refresh" }, _ = /* @__PURE__ */ N({
   __name: "AutoRefresh",
-  props: {
+  props: /* @__PURE__ */ k({
+    refreshFn: {},
+    enabled: { type: Boolean, default: !0 }
+  }, {
     modelValue: { type: Boolean, default: !1 },
     modelModifiers: {},
     interval: { default: 30 },
     intervalModifiers: {}
-  },
-  emits: /* @__PURE__ */ w(["refresh"], ["update:modelValue", "update:interval"]),
-  setup(s, { expose: v, emit: c }) {
-    const r = c, e = m(s, "modelValue"), o = m(s, "interval"), [V, h] = B(), l = () => {
-      V(() => {
-        r("refresh"), e.value && l();
-      }, o.value * 1e3);
+  }),
+  emits: ["update:modelValue", "update:interval"],
+  setup(r) {
+    const m = r, l = f(r, "modelValue"), t = f(r, "interval"), n = w(() => l.value && m.enabled), [h, i] = F();
+    let o = null;
+    const d = () => (o || (o = m.refreshFn().catch(() => {
+    }).finally(() => {
+      o = null;
+    })), o), s = () => {
+      h(async () => {
+        await d(), n.value && s();
+      }, t.value * 1e3);
     };
-    return v({ trigger: () => {
-      r("refresh"), e.value && l();
-    } }), n(e, (u) => {
-      u ? l() : h();
-    }), n(o, () => {
-      e.value && l();
-    }), T(() => {
-      e.value && (r("refresh"), l());
-    }), (u, t) => {
-      const E = x, g = M;
-      return i(), d("div", y, [
-        e.value ? (i(), d(b, { key: 0 }, [
-          t[2] || (t[2] = f("span", { class: "auto-refresh-label" }, "刷新间隔", -1)),
-          p(E, {
-            modelValue: o.value,
-            "onUpdate:modelValue": t[0] || (t[0] = (a) => o.value = a),
+    return x([n, t], ([a]) => {
+      a ? s() : i();
+    }), T(({ triggerType: a }) => {
+      n.value && (a === "activated" && (i(), d()), s());
+    }), (a, e) => {
+      const E = y, b = M;
+      return p(), c("div", g, [
+        l.value ? (p(), c(B, { key: 0 }, [
+          e[2] || (e[2] = v("span", { class: "auto-refresh-label" }, "刷新间隔", -1)),
+          V(E, {
+            modelValue: t.value,
+            "onUpdate:modelValue": e[0] || (e[0] = (u) => t.value = u),
             min: 1,
-            step: 5,
+            step: 1,
             size: "small",
             class: "auto-refresh-interval"
           }, null, 8, ["modelValue"]),
-          t[3] || (t[3] = f("span", { class: "auto-refresh-label" }, "秒", -1))
-        ], 64)) : k("", !0),
-        p(g, {
-          modelValue: e.value,
-          "onUpdate:modelValue": t[1] || (t[1] = (a) => e.value = a),
+          e[3] || (e[3] = v("span", { class: "auto-refresh-label" }, "秒", -1))
+        ], 64)) : R("", !0),
+        V(b, {
+          modelValue: l.value,
+          "onUpdate:modelValue": e[1] || (e[1] = (u) => l.value = u),
           "active-text": "自动刷新"
         }, null, 8, ["modelValue"])
       ]);
@@ -53,5 +57,5 @@ const y = { class: "auto-refresh" }, F = /* @__PURE__ */ N({
   }
 });
 export {
-  F as default
+  _ as default
 };

package/es/components/table/TableToolbar.vue.mjs

@@ -1,7 +1,7 @@
 import o from "./TableToolbar.vue2.mjs";
 /* empty css                   */
-import a from "../../_virtual/_plugin-vue_export-helper.mjs";
-const p = /* @__PURE__ */ a(o, [["__scopeId", "data-v-4a425d38"]]);
+import r from "../../_virtual/_plugin-vue_export-helper.mjs";
+const e = /* @__PURE__ */ r(o, [["__scopeId", "data-v-efbd16f8"]]);
 export {
-  p as default
+  e as default
 };

package/es/components/table/TableToolbar.vue2.mjs

@@ -1,11 +1,11 @@
-import { ElButton as g, ElIcon as k } from "element-plus/es";
+import { ElButton as b, ElIcon as R } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/button/style/css";
 import "element-plus/es/components/icon/style/css";
-import { defineComponent as A, useModel as B, computed as f, ref as i, watch as _, openBlock as a, createElementBlock as V, createElementVNode as x, createBlock as d, createCommentVNode as m, withCtx as c, createVNode as h, normalizeClass as y, unref as C, mergeModels as I } from "vue";
-import { Refresh as M } from "@element-plus/icons-vue";
-import w from "../misc/AutoRefresh.vue.mjs";
-const N = { class: "table-toolbar" }, T = { class: "table-toolbar-right" }, G = /* @__PURE__ */ A({
+import { defineComponent as E, useModel as A, computed as u, ref as B, watch as g, openBlock as s, createElementBlock as k, createElementVNode as x, createBlock as i, createCommentVNode as f, withCtx as d, createVNode as m, normalizeClass as V, unref as C, mergeModels as I } from "vue";
+import { Refresh as w } from "@element-plus/icons-vue";
+import y from "../misc/AutoRefresh.vue.mjs";
+const M = { class: "table-toolbar" }, _ = { class: "table-toolbar-right" }, q = /* @__PURE__ */ E({
   __name: "TableToolbar",
   props: /* @__PURE__ */ I({
     features: { default: () => ["refresh", "autoRefresh"] },
@@ -17,59 +17,53 @@ const N = { class: "table-toolbar" }, T = { class: "table-toolbar-right" }, G =
     isAutoRefreshModifiers: {}
   }),
   emits: ["update:isAutoRefresh"],
-  setup(s) {
-    const e = s, n = B(s, "isAutoRefresh"), p = f(
+  setup(o) {
+    const e = o, a = A(o, "isAutoRefresh"), c = u(
       () => e.features === void 0 || e.features.includes("refresh")
-    ), v = f(
+    ), h = u(
       () => e.features === void 0 || e.features.includes("autoRefresh")
-    ), l = i(30);
-    _(
+    ), l = B(30);
+    return g(
       () => e.refreshInterval,
-      (o) => {
-        l.value = o;
+      (n) => {
+        l.value = n;
       },
       { immediate: !0 }
-    );
-    const u = i(), R = () => {
-      var o;
-      (o = u.value) == null || o.trigger();
-    };
-    return (o, t) => {
-      const b = k, E = g;
-      return a(), V("div", N, [
-        x("div", T, [
-          v.value ? (a(), d(w, {
+    ), (n, t) => {
+      const p = R, v = b;
+      return s(), k("div", M, [
+        x("div", _, [
+          h.value ? (s(), i(y, {
             key: 0,
-            ref_key: "autoRefreshRef",
-            ref: u,
-            modelValue: n.value,
-            "onUpdate:modelValue": t[0] || (t[0] = (r) => n.value = r),
+            modelValue: a.value,
+            "onUpdate:modelValue": t[0] || (t[0] = (r) => a.value = r),
             interval: l.value,
             "onUpdate:interval": t[1] || (t[1] = (r) => l.value = r),
-            onRefresh: t[2] || (t[2] = (r) => e.tableExpose.refresh())
-          }, null, 8, ["modelValue", "interval"])) : m("", !0),
-          p.value ? (a(), d(E, {
+            refreshFn: e.tableExpose.refresh,
+            enabled: !o.loading
+          }, null, 8, ["modelValue", "interval", "refreshFn", "enabled"])) : f("", !0),
+          c.value ? (s(), i(v, {
             key: 1,
             circle: "",
-            onClick: R
+            onClick: t[2] || (t[2] = (r) => e.tableExpose.refresh())
           }, {
-            default: c(() => [
-              h(b, {
-                class: y({ "table-toolbar-icon--rotating": s.loading })
+            default: d(() => [
+              m(p, {
+                class: V({ "table-toolbar-icon--rotating": o.loading })
               }, {
-                default: c(() => [
-                  h(C(M))
+                default: d(() => [
+                  m(C(w))
                 ]),
                 _: 1
               }, 8, ["class"])
             ]),
             _: 1
-          })) : m("", !0)
+          })) : f("", !0)
         ])
       ]);
     };
   }
 });
 export {
-  G as default
+  q as default
 };

package/es/hooks/activated.mjs

@@ -1,34 +1,40 @@
-import { watch as i, ref as s, onMounted as n, onActivated as u, onDeactivated as v, onBeforeUnmount as d } from "vue";
-const c = () => {
-  const e = s(!1);
-  return n(() => {
-    e.value = !0, u(() => {
-      e.value = !0;
+import { watch as d, ref as n, computed as c, onMounted as o, onActivated as s, onDeactivated as r, onBeforeUnmount as u } from "vue";
+const v = () => {
+  const e = n({
+    isActivated: !1,
+    triggerType: "mounted"
+  }), i = c(() => e.value.isActivated), t = (a) => {
+    e.value = a;
+  };
+  return o(() => {
+    t({ isActivated: !0, triggerType: "mounted" }), s(() => {
+      t({ isActivated: !0, triggerType: "activated" });
     });
-  }), v(() => {
-    e.value = !1;
-  }), d(() => {
-    e.value = !1;
+  }), r(() => {
+    t({ isActivated: !1, triggerType: "deactivated" });
+  }), u(() => {
+    t({ isActivated: !1, triggerType: "unmounted" });
   }), {
-    isActivated: e
+    isActivated: i,
+    activatedInfo: c(() => e.value)
   };
-}, f = (e) => {
-  const { isActivated: t } = c();
-  i(
-    t,
-    (a) => {
-      a && e();
+}, g = (e) => {
+  const { activatedInfo: i } = v();
+  d(
+    i,
+    (t) => {
+      t.isActivated && e(t);
     },
     {
       immediate: !0
     }
   );
-}, l = (e, t) => {
-  const { isActivated: a } = c();
-  i(
-    a,
-    (o) => {
-      o ? e() : t();
+}, m = (e, i) => {
+  const { activatedInfo: t } = v();
+  d(
+    t,
+    (a) => {
+      a.isActivated ? e(a) : i(a);
     },
     {
       immediate: !0
@@ -36,7 +42,7 @@ const c = () => {
   );
 };
 export {
-  c as useActivated,
-  l as useActivatedEvent,
-  f as useActivatedExec
+  v as useActivated,
+  m as useActivatedEvent,
+  g as useActivatedExec
 };

package/es/style.css

@@ -1 +1 @@
-.form-item-tip[data-v-e889a0ed]{text-align:left;line-height:1.5;font-size:12px}.form-search_show[data-v-8896356d]{margin-bottom:10px}.form-search .btn-box[data-v-8896356d]{padding-left:20px}.form-search[data-v-8896356d] .el-col{padding-left:14px}.form-verify-image[data-v-a4baf877] .el-input__suffix-inner *{margin:0}.form-verify-image-suffix[data-v-a4baf877]{position:absolute;height:100%;border-radius:var(--el-input-border-radius, var(--el-border-radius-base));top:50%;transform:translateY(-50%);overflow:hidden;cursor:pointer}.form-verify-image-suffix-main[data-v-a4baf877]{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#f4f4f4}.auto-refresh[data-v-b734f05f]{display:flex;align-items:center;gap:8px}.auto-refresh-label[data-v-b734f05f]{font-size:13px;color:var(--el-text-color-regular)}.auto-refresh-interval[data-v-b734f05f]{width:80px}.confirm-dialog .content[data-v-2f0c870e]{overflow-x:hidden;overflow-y:auto;max-height:calc(100vh - 200px)}.confirm-dialog .btn[data-v-2f0c870e]{width:150px;height:40px;border-radius:4px}.confirm-dialog .main[data-v-2f0c870e]{position:relative;text-align:center}.confirm-dialog .main .close-box[data-v-2f0c870e]{position:absolute;top:0;right:0;cursor:pointer;z-index:2}.confirm-dialog .main .shim[data-v-2f0c870e]{position:relative;z-index:1}.confirm-dialog .main .shim .title[data-v-2f0c870e]{font-size:18px;font-weight:500}.confirm-dialog .main .shim .content[data-v-2f0c870e]{font-size:16px;margin-top:15px}.confirm-dialog .main .shim .footer[data-v-2f0c870e]{display:flex;justify-content:center;align-items:center;padding-top:5px}.confirm-dialog .main .shim .footer>.btn[data-v-2f0c870e]:not(:last-child){margin-right:30px}.confirm-dialog .main .shim .footer[reverse=true][data-v-2f0c870e]{flex-direction:row-reverse}.confirm-dialog .main .shim .footer[reverse=true]>.btn[data-v-2f0c870e]:not(:last-child){margin-right:0;margin-left:30px}.confirm-dialog .el-dialog__header,.confirm-dialog .el-dialog__body{padding:0;background-color:transparent}.table-toolbar[data-v-4a425d38]{display:flex;justify-content:flex-end;align-items:center;padding-bottom:8px}.table-toolbar-right[data-v-4a425d38]{display:flex;align-items:center;gap:8px}.table-toolbar-icon--rotating[data-v-4a425d38]{animation:table-toolbar-rotating-4a425d38 1s linear infinite}@keyframes table-toolbar-rotating-4a425d38{0%{transform:rotate(0)}to{transform:rotate(360deg)}}.table-main-table[data-v-5944984b]{--el-table-header-bg-color: var(--v7c6ca44f)}.table-main-pagination[data-v-5944984b]{margin-top:10px;display:flex;justify-content:flex-end}.list-page[data-v-a578c778]{min-height:var(--bb4a2a8e)}.list-page-operation[data-v-a578c778]{margin-bottom:10px}.list-page[data-v-a578c778] .el-loading-mask{left:-10px;top:-10px;right:-10px;bottom:-10px}
+.form-item-tip[data-v-e889a0ed]{text-align:left;line-height:1.5;font-size:12px}.form-search_show[data-v-8896356d]{margin-bottom:10px}.form-search .btn-box[data-v-8896356d]{padding-left:20px}.form-search[data-v-8896356d] .el-col{padding-left:14px}.form-verify-image[data-v-a4baf877] .el-input__suffix-inner *{margin:0}.form-verify-image-suffix[data-v-a4baf877]{position:absolute;height:100%;border-radius:var(--el-input-border-radius, var(--el-border-radius-base));top:50%;transform:translateY(-50%);overflow:hidden;cursor:pointer}.form-verify-image-suffix-main[data-v-a4baf877]{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#f4f4f4}.auto-refresh[data-v-4446ddf0]{display:flex;align-items:center;gap:8px}.auto-refresh-label[data-v-4446ddf0]{font-size:13px;color:var(--el-text-color-regular)}.auto-refresh-interval[data-v-4446ddf0]{width:80px}.confirm-dialog .content[data-v-2f0c870e]{overflow-x:hidden;overflow-y:auto;max-height:calc(100vh - 200px)}.confirm-dialog .btn[data-v-2f0c870e]{width:150px;height:40px;border-radius:4px}.confirm-dialog .main[data-v-2f0c870e]{position:relative;text-align:center}.confirm-dialog .main .close-box[data-v-2f0c870e]{position:absolute;top:0;right:0;cursor:pointer;z-index:2}.confirm-dialog .main .shim[data-v-2f0c870e]{position:relative;z-index:1}.confirm-dialog .main .shim .title[data-v-2f0c870e]{font-size:18px;font-weight:500}.confirm-dialog .main .shim .content[data-v-2f0c870e]{font-size:16px;margin-top:15px}.confirm-dialog .main .shim .footer[data-v-2f0c870e]{display:flex;justify-content:center;align-items:center;padding-top:5px}.confirm-dialog .main .shim .footer>.btn[data-v-2f0c870e]:not(:last-child){margin-right:30px}.confirm-dialog .main .shim .footer[reverse=true][data-v-2f0c870e]{flex-direction:row-reverse}.confirm-dialog .main .shim .footer[reverse=true]>.btn[data-v-2f0c870e]:not(:last-child){margin-right:0;margin-left:30px}.confirm-dialog .el-dialog__header,.confirm-dialog .el-dialog__body{padding:0;background-color:transparent}.table-toolbar[data-v-efbd16f8]{display:flex;justify-content:flex-end;align-items:center;padding-bottom:8px}.table-toolbar-right[data-v-efbd16f8]{display:flex;align-items:center;gap:8px}.table-toolbar-icon--rotating[data-v-efbd16f8]{animation:table-toolbar-rotating-efbd16f8 1s linear infinite}@keyframes table-toolbar-rotating-efbd16f8{0%{transform:rotate(0)}to{transform:rotate(360deg)}}.table-main-table[data-v-5944984b]{--el-table-header-bg-color: var(--v7c6ca44f)}.table-main-pagination[data-v-5944984b]{margin-top:10px;display:flex;justify-content:flex-end}.list-page[data-v-a578c778]{min-height:var(--bb4a2a8e)}.list-page-operation[data-v-a578c778]{margin-bottom:10px}.list-page[data-v-a578c778] .el-loading-mask{left:-10px;top:-10px;right:-10px;bottom:-10px}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/admin-core",
-  "version": "0.1.1-alpha.0",
+  "version": "0.1.1-alpha.1",
   "description": "后台管理核心",
   "private": false,
   "main": "lib/index.cjs",
@@ -77,5 +77,5 @@
     "node": ">=18.0.0",
     "pnpm": ">=9.0.0"
   },
-  "gitHead": "ee98121b978b17eb12a861b97ef26227d2315523"
+  "gitHead": "702df9158b5cfa3bf2f7c667fb10cbe5168b9a7a"
 }

package/types/components/misc/AutoRefresh.vue.d.ts

@@ -1,14 +1,26 @@
 declare const _default: import('vue').DefineComponent<globalThis.ExtractPropTypes<{
     modelValue: import('vue').PropType<boolean>;
     interval: import('vue').PropType<number>;
-}>, {
-    trigger: () => void;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    refresh: () => void;
-}, string, import('vue').PublicProps, Readonly<globalThis.ExtractPropTypes<{
+    refreshFn: {
+        type: globalThis.PropType<() => Promise<unknown>>;
+        required: true;
+    };
+    enabled: {
+        type: globalThis.PropType<boolean>;
+        default: boolean;
+    };
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<globalThis.ExtractPropTypes<{
     modelValue: import('vue').PropType<boolean>;
     interval: import('vue').PropType<number>;
-}>> & Readonly<{
-    onRefresh?: (() => any) | undefined;
-}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+    refreshFn: {
+        type: globalThis.PropType<() => Promise<unknown>>;
+        required: true;
+    };
+    enabled: {
+        type: globalThis.PropType<boolean>;
+        default: boolean;
+    };
+}>> & Readonly<{}>, {
+    enabled: boolean;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/types/hooks/activated.d.ts

@@ -1,8 +1,17 @@
+/** 激活信息 */
+export interface ActivatedInfo {
+    isActivated: boolean;
+    triggerType: "mounted" | "activated" | "deactivated" | "unmounted";
+}
 /** 是否激活 */
 export declare const useActivated: () => {
-    isActivated: globalThis.Ref<boolean, boolean>;
+    isActivated: globalThis.ComputedRef<boolean>;
+    activatedInfo: globalThis.ComputedRef<{
+        isActivated: boolean;
+        triggerType: "mounted" | "activated" | "deactivated" | "unmounted";
+    }>;
 };
 /** 激活时执行时间 */
-export declare const useActivatedExec: (callback: () => void) => void;
+export declare const useActivatedExec: (callback: (info: ActivatedInfo) => void) => void;
 /** 激活时监听事件 */
-export declare const useActivatedEvent: (bind: () => void, unbind: () => void) => void;
+export declare const useActivatedEvent: (bind: (info: ActivatedInfo) => void, unbind: (info: ActivatedInfo) => void) => void;