@liujitcn/kratos-admin-system 0.0.55 → 0.0.57

package/dist/package/src/views/profile/components/session.vue

@@ -13,20 +13,21 @@
       </div>
     </template>
 
-    <ProTable ref="proTable" row-key="session_id" :columns="columns" :request-api="requestSessionTable" :pagination="false" />
-    <div class="session-actions">
-      <el-button type="danger" plain :disabled="!hasSessions" @click="revokeAll">
-        <el-icon><SwitchButton /></el-icon>
-        {{ t("system.profile.session.action.revoke_all") }}
-      </el-button>
-    </div>
+    <ProTable
+      ref="proTable"
+      row-key="session_id"
+      :columns="columns"
+      :header-actions="headerActions"
+      :request-api="requestSessionTable"
+      :pagination="false"
+    />
   </el-card>
 </template>
 
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
-import type { ColumnProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import { useRouter } from "vue-router";
 import { t } from "@liujitcn/kratos-admin-core";
 import { LOGIN_URL } from "@liujitcn/kratos-admin-core/config";
@@ -38,6 +39,15 @@ import type { BaseSession } from "@liujitcn/kratos-admin-system/rpc/system/admin
 const loading = ref(false);
 const proTable = ref<ProTableInstance>();
 const hasSessions = ref(false);
+const headerActions = computed<HeaderActionProps[]>(() => [
+  {
+    label: t("system.profile.session.action.revoke_all"),
+    type: "danger",
+    icon: SwitchButton,
+    disabled: () => !hasSessions.value,
+    onClick: () => revokeAll()
+  }
+]);
 const columns = computed<ColumnProps[]>(() => [
   {
     prop: "current",
@@ -140,10 +150,6 @@ function formatExpires(seconds: number) {
   color: var(--el-text-color-secondary);
   font-size: 13px;
 }
-.session-actions {
-  justify-content: flex-end;
-  margin-top: 20px;
-}
 @media screen and (width <= 640px) {
   .session-header {
     align-items: flex-start;

package/dist/package/src/views/tool/code-gen/table/index.vue

@@ -56,7 +56,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, h, onBeforeUnmount, nextTick, reactive, ref } from "vue";
+import { computed, h, onBeforeUnmount, reactive, ref } from "vue";
 import { useRouter } from "vue-router";
 import {
   CirclePlus,
@@ -789,6 +789,7 @@ function refreshTable() {
 
 /** 打开新增或编辑弹窗，并加载当前表单所需选项。 */
 async function handleOpenDialog(tableId?: number) {
+  resetForm();
   await formDialogRef.value?.open({
     load: async () => {
       await loadSourceOptions();
@@ -831,7 +832,6 @@ async function handleOpenDialog(tableId?: number) {
       };
     },
     commit: ({ form, tables, menuOptions, businessModuleItems: items, columns, leftTreeColumns }) => {
-      resetForm();
       Object.assign(formData, form);
       databaseTables.value = tables;
       parentMenuOptions.value = menuOptions;
@@ -863,14 +863,12 @@ function handleCloseDialog() {
 
 /** 重置弹窗表单和字段选项。 */
 function resetForm() {
+  formDialogRef.value?.resetFields();
+  formDialogRef.value?.clearValidate();
   Object.assign(formData, { ...createDefaultCodeGenTableForm(), parent_menu_id: undefined });
   dialog.editing = false;
   databaseColumns.value = [];
   leftTreeDatabaseColumns.value = [];
-  void nextTick(() => {
-    formDialogRef.value?.resetFields();
-    formDialogRef.value?.clearValidate();
-  });
 }
 
 /** 选择业务表后同步数据库注释、默认命名、字段选项和树字段默认值。 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-system",
   "private": false,
-  "version": "0.0.55",
+  "version": "0.0.57",
   "type": "module",
   "description": "kratos-admin system management module",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "sortablejs": "^1.15.2",
     "swagger-ui-dist": "^5.32.15",
     "vue-element-plus-x": "^2.0.3",
-    "@liujitcn/kratos-admin-core": "0.0.55"
+    "@liujitcn/kratos-admin-core": "0.0.57"
   },
   "peerDependencies": {
     "@element-plus/icons-vue": "^2.3.1",