cosey 0.2.5 → 0.2.7

package/components/table/table.vue.d.ts

@@ -1,5 +1,5 @@
-import { type TableSlots, type TableExpose } from './table';
 import { type PaginationProps } from 'element-plus';
+import { type TableSlots, type TableExpose } from './table';
 import { type TableColumnProps } from './table-column/table-column';
 type __VLS_Slots = TableSlots;
 declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<{

package/components/table/table.vue.js

@@ -1,13 +1,13 @@
-import { defineComponent, useSlots, computed, unref, useTemplateRef, mergeProps, ref, watch, resolveComponent, resolveDirective, withDirectives, createElementBlock, openBlock, normalizeStyle, normalizeClass, createCommentVNode, createElementVNode, createVNode, createBlock, renderSlot, withCtx, createSlots, Fragment, renderList, normalizeProps, guardReactiveProps } from 'vue';
+import { defineComponent, useSlots, unref, computed, ref, useTemplateRef, mergeProps, watch, resolveComponent, resolveDirective, withDirectives, createElementBlock, openBlock, normalizeStyle, normalizeClass, createCommentVNode, createElementVNode, createVNode, createBlock, renderSlot, withCtx, createSlots, Fragment, renderList, normalizeProps, guardReactiveProps } from 'vue';
 import { merge, cloneDeep, get } from 'lodash-es';
-import { tableProps, defaultTableConfig, elSlotsName, omittedTableProps, defaultPaginationProps, tableExposeKeys } from './table.js';
+import { reactiveComputed, reactiveOmit } from '@vueuse/core';
 import { useZIndex, ElButton } from 'element-plus';
+import { tableProps, defaultTableConfig, elSlotsName, omittedTableProps, defaultPaginationProps, tableExposeKeys } from './table.js';
 import stdin_default$6 from './table-column/table-column.vue.js';
 import stdin_default$5 from './table-column-editor/table-column-editor.vue.js';
 import stdin_default$2 from './table-query/table-query.vue.js';
 import stdin_default$4 from './table-export/table-export.vue.js';
 import stdin_default$3 from '../icon/icon.vue.js';
-import { reactiveOmit } from '@vueuse/core';
 import { filterEmptyFormValue } from './utils.js';
 import stdin_default$1 from './style/index.js';
 import { useComponentConfig, useConfig } from '../config-provider/config-provider.js';
@@ -54,17 +54,17 @@ var stdin_default = /* @__PURE__ */defineComponent({
     const {
       table
     } = useConfig();
-    const tableKeys = computed(() => {
+    const tableKeys = reactiveComputed(() => {
       return merge({}, defaultTableConfig.keys, unref(table)?.keys, props.keys);
     });
     const passedElSlotsName = computed(() => {
       return elSlotsName.filter(name => !!slots[name]);
     });
-    const elTableRef = useTemplateRef("table");
+    const elTableRef = ref();
     const tableQueryRef = useTemplateRef("tableQuery");
     const mapOrderType = {
-      ascending: tableKeys.value.asc,
-      descending: tableKeys.value.desc
+      ascending: tableKeys.asc,
+      descending: tableKeys.desc
     };
     let orderParams = null;
     const onSortChange = ({
@@ -72,8 +72,8 @@ var stdin_default = /* @__PURE__ */defineComponent({
       order
     }) => {
       orderParams = order ? {
-        [tableKeys.value.orderBy]: prop,
-        [tableKeys.value.orderType]: mapOrderType[order]
+        [tableKeys.orderBy]: prop,
+        [tableKeys.orderType]: mapOrderType[order]
       } : null;
       page.value = 1;
       execute();
@@ -106,8 +106,8 @@ var stdin_default = /* @__PURE__ */defineComponent({
       execute
     } = useFetch(() => {
       let params = {
-        [tableKeys.value.page]: page.value,
-        [tableKeys.value.pageSize]: pageSize.value,
+        [tableKeys.page]: page.value,
+        [tableKeys.pageSize]: pageSize.value,
         ...orderParams,
         ...filterEmptyFormValue(tableQueryRef.value?.getFieldsValue() || {})
       };
@@ -117,8 +117,8 @@ var stdin_default = /* @__PURE__ */defineComponent({
       immediate: props.immediate,
       onSuccess(res) {
         res = props.afterFetch?.(res) || res;
-        tableData.value = (tableKeys.value.list ? get(res, tableKeys.value.list) : res) || [];
-        total.value = get(res, tableKeys.value.total) || 0;
+        tableData.value = (tableKeys.list ? get(res, tableKeys.list) : res) || [];
+        total.value = +get(res, tableKeys.total) || 0;
         elTableRef.value?.setScrollTop(0);
       },
       onFinally() {
@@ -345,8 +345,8 @@ var stdin_default = /* @__PURE__ */defineComponent({
       /* CLASS */)) : createCommentVNode("v-if", true), createElementVNode("div", {
         class: normalizeClass(`${unref(prefixCls)}-table`)
       }, [createVNode(_component_el_table, mergeProps({
-        ref_key: "table",
-        ref: table
+        ref_key: "elTableRef",
+        ref: elTableRef
       }, elTableProps.value, {
         data: tableData.value,
         "expand-row-keys": innerExpandRowKeys.value,

package/layout/layout-user-menu/layout-user-menu.vue.js

@@ -1,8 +1,9 @@
-import { defineComponent, ref, resolveComponent, resolveDirective, createBlock, openBlock, withCtx, createElementVNode, normalizeClass, unref, createVNode, toDisplayString, createCommentVNode, resolveDynamicComponent, withDirectives, createElementBlock } from 'vue';
+import { defineComponent, ref, resolveComponent, createBlock, openBlock, withCtx, createVNode, normalizeClass, unref, createElementVNode, toDisplayString, createCommentVNode, resolveDynamicComponent } from 'vue';
 import { useRouter } from 'vue-router';
 import { useGlobalConfig } from '../../config/index.js';
 import { useUserStore } from '../../store/user.js';
 import stdin_default$1 from './style/index.js';
+import { ElLoading } from 'element-plus';
 import { useLocale } from '../../hooks/useLocale.js';
 import { useComponentConfig } from '../../components/config-provider/config-provider.js';
 import { Icon as _Icon } from '../../components/icon/index.js';
@@ -39,19 +40,26 @@ var stdin_default = /* @__PURE__ */defineComponent({
     };
     const fullscreenLoading = ref(false);
     const logout = () => {
+      if (fullscreenLoading.value) return;
       fullscreenLoading.value = true;
+      const loading = ElLoading.service({
+        lock: true,
+        text: t("co.auth.loggingOut")
+      });
       userStore.logout().finally(() => {
         fullscreenLoading.value = false;
+        loading.close();
       });
     };
     return (_ctx, _cache) => {
       const _component_el_avatar = resolveComponent("el-avatar");
+      const _component_el_button = resolveComponent("el-button");
       const _component_el_dropdown_item = resolveComponent("el-dropdown-item");
       const _component_el_dropdown_menu = resolveComponent("el-dropdown-menu");
       const _component_el_dropdown = resolveComponent("el-dropdown");
-      const _directive_loading = resolveDirective("loading");
       return openBlock(), createBlock(_component_el_dropdown, {
-        placement: "bottom"
+        placement: "bottom",
+        trigger: "click"
       }, {
         dropdown: withCtx(() => [createVNode(_component_el_dropdown_menu, {
           class: normalizeClass([unref(hashId), `${unref(prefixCls)}-dropdown`])
@@ -85,38 +93,39 @@ var stdin_default = /* @__PURE__ */defineComponent({
             divided: "",
             onClick: logout
           }, {
-            default: withCtx(() => [withDirectives((openBlock(), createElementBlock("div", null, [createVNode(unref(_Icon), {
+            default: withCtx(() => [createVNode(unref(_Icon), {
               name: "co:logout",
               size: "lg"
             }), createElementVNode("span", {
               class: normalizeClass(`${unref(prefixCls)}-item-title`)
             }, toDisplayString(unref(t)("co.auth.logout")), 3
-            /* TEXT, CLASS */)])), [[_directive_loading, fullscreenLoading.value, void 0, {
-              fullscreen: true,
-              lock: true
-            }]])]),
+            /* TEXT, CLASS */)]),
             _: 1
             /* STABLE */
           })]),
           _: 1
           /* STABLE */
         }, 8, ["class"])]),
-        default: withCtx(() => [createElementVNode("div", {
+        default: withCtx(() => [createVNode(_component_el_button, {
+          link: "",
           class: normalizeClass([unref(hashId), unref(prefixCls)])
-        }, [createVNode(_component_el_avatar, {
-          size: 32,
-          src: unref(userStore).userInfo?.avatar
         }, {
-          default: withCtx(() => [createVNode(unref(_Icon), {
-            name: "co:user"
-          })]),
+          default: withCtx(() => [createVNode(_component_el_avatar, {
+            size: 32,
+            src: unref(userStore).userInfo?.avatar
+          }, {
+            default: withCtx(() => [createVNode(unref(_Icon), {
+              name: "co:user"
+            })]),
+            _: 1
+            /* STABLE */
+          }, 8, ["src"]), createElementVNode("span", {
+            class: normalizeClass(`${unref(prefixCls)}-name`)
+          }, toDisplayString(unref(userStore).userInfo?.nickname), 3
+          /* TEXT, CLASS */)]),
           _: 1
           /* STABLE */
-        }, 8, ["src"]), createElementVNode("span", {
-          class: normalizeClass(`${unref(prefixCls)}-name`)
-        }, toDisplayString(unref(userStore).userInfo?.nickname), 3
-        /* TEXT, CLASS */)], 2
-        /* CLASS */)]),
+        }, 8, ["class"])]),
         _: 1
         /* STABLE */
       });

package/layout/layout-user-menu/style/index.js

@@ -9,8 +9,15 @@ var stdin_default = getSimpleStyleHook("LayoutUserMenu", (token) => {
       alignItems: "center",
       borderRadius: token.borderRadius,
       cursor: "pointer",
-      "&:focus-visible": {
-        outline: "none"
+      "&:hover": {
+        img: {
+          opacity: 0.6
+        }
+      },
+      "&:active": {
+        img: {
+          opacity: 1
+        }
       },
       [`${componentCls}-name`]: {
         marginInlineStart: token.marginXS,

package/locale/lang/ar.d.ts

@@ -102,6 +102,7 @@ declare const _default: {
             enterPassword: string;
             password: string;
             logout: string;
+            loggingOut: string;
         };
         tabbar: {
             closeLeftTabs: string;

package/locale/lang/ar.js

@@ -104,7 +104,8 @@ var stdin_default = {
       username: "\u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645",
       enterPassword: "\u0627\u0644\u0631\u062C\u0627\u0621 \u0625\u062F\u062E\u0627\u0644 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631",
       password: "\u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631",
-      logout: "\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C"
+      logout: "\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C",
+      loggingOut: "\u062C\u0627\u0631\u064A \u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C..."
     },
     tabbar: {
       closeLeftTabs: "\u0625\u063A\u0644\u0627\u0642 \u0639\u0644\u0627\u0645\u0627\u062A \u0627\u0644\u062A\u0628\u0648\u064A\u0628 \u0627\u0644\u064A\u0633\u0631\u0649",

package/locale/lang/en.d.ts

@@ -102,6 +102,7 @@ declare const _default: {
             enterPassword: string;
             password: string;
             logout: string;
+            loggingOut: string;
         };
         tabbar: {
             closeLeftTabs: string;

package/locale/lang/en.js

@@ -104,7 +104,8 @@ var stdin_default = {
       username: "Username",
       enterPassword: "Please enter your password",
       password: "Password",
-      logout: "Logout"
+      logout: "Logout",
+      loggingOut: "Logging out..."
     },
     tabbar: {
       closeLeftTabs: "Close tabs to the left",

package/locale/lang/zh-cn.d.ts

@@ -102,6 +102,7 @@ declare const _default: {
             enterPassword: string;
             password: string;
             logout: string;
+            loggingOut: string;
         };
         tabbar: {
             closeLeftTabs: string;

package/locale/lang/zh-cn.js

@@ -104,7 +104,8 @@ var stdin_default = {
       username: "\u7528\u6237\u540D",
       enterPassword: "\u8BF7\u8F93\u5165\u5BC6\u7801",
       password: "\u5BC6\u7801",
-      logout: "\u9000\u51FA"
+      logout: "\u9000\u51FA",
+      loggingOut: "\u6B63\u5728\u9000\u51FA"
     },
     tabbar: {
       closeLeftTabs: "\u5173\u95ED\u5DE6\u4FA7\u6807\u7B7E\u9875",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",