From 9b4a2bc5d5033ef934044785886c52dd9f343616 Mon Sep 17 00:00:00 2001
From: aeizzz <aeizzz@foxmail.com>
Date: Fri, 10 Feb 2023 10:59:22 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A4=E7=89=8C=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/token.ts               |  16 ++++
 src/hooks/table.ts                   |  40 ++++++---
 src/utils/other.ts                   |   5 +-
 src/views/admin/dict/index.vue       |   4 +-
 src/views/admin/log/index.vue        |   4 +-
 src/views/admin/token/i18n/en.ts     |  11 +++
 src/views/admin/token/i18n/zh-cn.ts  |  12 +++
 src/views/admin/token/index.vue      | 120 +++++++++++++++++++++++++++
 src/views/daemon/job-manage/form.vue |   9 +-
 9 files changed, 203 insertions(+), 18 deletions(-)
 create mode 100644 src/api/admin/token.ts
 create mode 100644 src/views/admin/token/i18n/en.ts
 create mode 100644 src/views/admin/token/i18n/zh-cn.ts
 create mode 100644 src/views/admin/token/index.vue

diff --git a/src/api/admin/token.ts b/src/api/admin/token.ts
new file mode 100644
index 00000000..6225095a
--- /dev/null
+++ b/src/api/admin/token.ts
@@ -0,0 +1,16 @@
+import request from "/@/utils/request"
+
+export function fetchList(query: object) {
+    return request({
+        url: '/admin/token/page',
+        method: 'post',
+        data: query
+    })
+}
+
+export function delObj(token:string) {
+    return request({
+        url: '/admin/token/' + token,
+        method: 'delete'
+    })
+}
diff --git a/src/hooks/table.ts b/src/hooks/table.ts
index 7daaf9d3..d6686345 100644
--- a/src/hooks/table.ts
+++ b/src/hooks/table.ts
@@ -1,5 +1,5 @@
 import { ElMessage } from "element-plus";
-import other from "../utils/other";
+import other, { deepMerge } from "../utils/other";
 
 export interface BasicTableProps {
     // 是否在创建页面时，调用数据列表接口
@@ -22,6 +22,10 @@ export interface BasicTableProps {
     loading?: Boolean
 
     selectObjs?: any[]
+
+    descs?: string[]
+
+    ascs?: string[]
 }
 
 export interface Pagination {
@@ -54,7 +58,9 @@ export function useTable(options?: BasicTableProps) {
         } as Pagination,
         dataListSelections: [],
         loading: false,
-        selectObjs: []
+        selectObjs: [],
+        descs: [],
+        ascs: []
     }
 
     const mergeDefaultOptions = (options: any, props: any): BasicTableProps => {
@@ -67,7 +73,7 @@ export function useTable(options?: BasicTableProps) {
     }
 
     // 覆盖默认值
-    const state = mergeDefaultOptions(defaultOptions, options)
+    const state = mergeDefaultOptions(defaultOptions,options)
 
 
     const query = () => {
@@ -77,10 +83,12 @@ export function useTable(options?: BasicTableProps) {
                 ...state.queryForm,
                 current: state.pagination?.current,
                 size: state.pagination?.size,
-            }).then(res => {
+                descs: state.descs,
+                ascs: state.ascs
+            }).then((res: any) => {
                 state.dataList = state.isPage ? res.data.records : res.data
                 state.pagination!.total = state.isPage ? res.data.total : 0
-            }).catch(err => {
+            }).catch((err: any) => {
                 ElMessage.error(err.data.msg)
             }).finally(() => {
                 state.loading = false;
@@ -110,12 +118,22 @@ export function useTable(options?: BasicTableProps) {
     const sortChangeHandle = (column: any) => {
         const prop = other.toUnderline(column.prop);
         if (column.order === 'descending') {
-            state.queryForm!.descs.push(prop)
-            state.queryForm!.ascs.splice(state.queryForm!.ascs.indexOf(prop), 1)
-        }
-        if (column.order === 'ascending') {
-            state.queryForm!.ascs.push(prop)
-            state.queryForm!.descs.splice(state.queryForm!.descs.indexOf(prop), 1)
+            state.descs?.push(prop)
+            if(state.ascs!.indexOf(prop) >=0){
+                state.ascs?.splice(state.ascs.indexOf(prop), 1)
+            }
+        }else if (column.order === 'ascending') {
+            state.ascs?.push(prop)
+            if(state.descs!.indexOf(prop) >=0){
+                state.descs?.splice(state.descs.indexOf(prop), 1)
+            }
+        }else{
+            if(state.ascs!.indexOf(prop) >=0){
+                state.ascs?.splice(state.ascs.indexOf(prop), 1)
+            }
+            if(state.descs!.indexOf(prop) >=0){
+                state.descs?.splice(state.descs.indexOf(prop), 1)
+            }
         }
         query();
     }
diff --git a/src/utils/other.ts b/src/utils/other.ts
index fd5dcbf2..ae24c76d 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -10,6 +10,8 @@ import { Local } from '/@/utils/storage';
 import { verifyUrl } from '/@/utils/toolsValidate';
 import request from "/@/utils/request";
 import { useMessage } from "/@/hooks/message";
+import { cloneDeep } from 'lodash-es';
+import { isObject } from './is';
 // @ts-ignore
 import * as CryptoJS from "crypto-js";
 
@@ -325,7 +327,7 @@ export function handleTree(data, id, parentId, children, rootId) {
 }
 
 /**
- * 
+ *
  * @param str 驼峰转下划线
  * @returns 下划线
  */
@@ -333,5 +335,6 @@ export function toUnderline(str: string) {
 	return str.replace(/([A-Z])/g, "_$1").toLowerCase()
 }
 
+
 // 统一批量导出
 export default other;
diff --git a/src/views/admin/dict/index.vue b/src/views/admin/dict/index.vue
index de7b4dae..1259bae2 100644
--- a/src/views/admin/dict/index.vue
+++ b/src/views/admin/dict/index.vue
@@ -37,14 +37,14 @@
       <el-table :data="state.dataList" v-loading="state.loading" style="width: 100%">
         <el-table-column type="index" label="序号" width="50" />
         <el-table-column prop="dictType" label="类型" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="description" label="描述" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="description" label="描述" show-overflow-tooltip sortable></el-table-column>
         <el-table-column prop="systemFlag" label="字典类型" show-overflow-tooltip>
           <template #default="scope">
             <dict-tag :options="dict_type" :value="scope.row.systemFlag"></dict-tag>
           </template>
         </el-table-column>
         <el-table-column prop="remarks" label="备注信息" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip sortable></el-table-column>
 
         <el-table-column label="操作" width="200">
           <template #default="scope">
diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue
index b0890213..74e028f5 100644
--- a/src/views/admin/log/index.vue
+++ b/src/views/admin/log/index.vue
@@ -90,9 +90,7 @@ const multiple = ref(true);
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {
     logType: '',
-    createTime: '',
-    descs: ['create_time'],
-    ascs: [],
+    createTime: ''
   },
   selectObjs: [],
   pageList: pageList
diff --git a/src/views/admin/token/i18n/en.ts b/src/views/admin/token/i18n/en.ts
new file mode 100644
index 00000000..4f66a3b1
--- /dev/null
+++ b/src/views/admin/token/i18n/en.ts
@@ -0,0 +1,11 @@
+export default {
+    systoken: {
+        index: 'index',
+        userId: 'userId',
+        username: 'username',
+        clientId: 'clientId',
+        accessToken: 'accessToken',
+        expiresAt: 'expiresAt',
+        inputUsernameTip: 'input Username'
+    }
+}
diff --git a/src/views/admin/token/i18n/zh-cn.ts b/src/views/admin/token/i18n/zh-cn.ts
new file mode 100644
index 00000000..fb76e7eb
--- /dev/null
+++ b/src/views/admin/token/i18n/zh-cn.ts
@@ -0,0 +1,12 @@
+export default {
+    systoken: {
+        index: '序号',
+        userId: '用户ID',
+        username: '用户名',
+        clientId: '客户端',
+        accessToken: '令牌',
+        expiresAt: '过期时间',
+        inputUsernameTip: '请输入用户名'
+    },
+
+}
diff --git a/src/views/admin/token/index.vue b/src/views/admin/token/index.vue
new file mode 100644
index 00000000..213d8d12
--- /dev/null
+++ b/src/views/admin/token/index.vue
@@ -0,0 +1,120 @@
+<template>
+  <div class="layout-padding">
+
+    <el-card class="layout-padding-auto" shadow="hover">
+      <el-row v-show="showSearch" class="mb8">
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true">
+          <el-form-item :label="$t('systoken.username')" prop="username">
+            <el-input v-model="state.queryForm.username" :placeholder="$t('systoken.inputUsernameTip')"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="getDataList">{{ $t('common.queryBtn') }}</el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button size="default" :disabled="multiple" icon="Delete" type="primary" class="ml10"
+            v-auth="'sys_user_del'" @click="handleDelete(undefined)">
+            {{ $t('common.delBtn') }}
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" class="ml10" style="float: right;margin-right: 20px"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table v-loading="state.loading" :data="state.dataList" style="width: 100%"
+        @selection-change="handleSelectionChange" @sort-change="sortChangeHandle">
+        <el-table-column align="center" type="selection" width="50" />
+        <el-table-column :label="$t('systoken.index')" type="index" width="80" />
+        <el-table-column :label="$t('systoken.userId')" prop="userId" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('systoken.username')" prop="username" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('systoken.clientId')" prop="clientId" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('systoken.accessToken')" prop="accessToken" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('systoken.expiresAt')" prop="expiresAt" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('common.action')" width="100">
+          <template #default="scope">
+            <el-button v-auth="'sys_user_del'" size="small" text type="primary" @click="handleDelete(scope.row)">
+              {{ $t('common.delBtn') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-bind="state.pagination" @size-change="sizeChangeHandle" @current-change="currentChangeHandle">
+      </pagination>
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList,delObj } from "/@/api/admin/token";
+import { useI18n } from 'vue-i18n'
+import { useMessage, useMessageBox } from "/@/hooks/message";
+
+const { t } = useI18n()
+// 定义变量内容
+const queryRef = ref();
+const showSearch = ref(true)
+
+// 多选rows
+const selectObjs = ref([]);
+// 是否可以多选
+const multiple = ref(true);
+
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {
+    username: ''
+  },
+  pageList: fetchList
+});
+
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sortChangeHandle,
+  sizeChangeHandle
+} = useTable(state)
+
+
+// 清空搜索条件
+const resetQuery = () => {
+  queryRef.value.resetFields()
+  getDataList()
+}
+
+// 多选事件
+const handleSelectionChange = (val: any) => {
+  selectObjs.value = val
+  multiple.value = !val.length
+}
+
+
+// 删除数据
+const handleDelete = (row: any) => {
+  if (!row) {
+    selectObjs.value.forEach(val => {
+      handleDelete(val)
+    });
+    return
+  }
+
+  useMessageBox().confirm(`${t('common.delConfirmText')}：${row.username} ?`).then(() => {
+    // 删除用户的接口
+    delObj(row.accessToken).then(() => {
+      getDataList();
+      useMessage().success(t('common.delSuccessText'))
+    }).catch(err => {
+      useMessage().error(err.msg)
+    })
+  })
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/daemon/job-manage/form.vue b/src/views/daemon/job-manage/form.vue
index 8e89c5f8..2e852c76 100644
--- a/src/views/daemon/job-manage/form.vue
+++ b/src/views/daemon/job-manage/form.vue
@@ -132,7 +132,14 @@ const popoverVis = (bol: boolean) => {
 
 const popoverVisible = ref(false)
 // 定义校验规则
-const dataRules = ref({})
+const dataRules = reactive({
+  jobName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
+  jobGroup: [{ required: true, message: '任务组名不能为空', trigger: 'blur' }],
+  jobType: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }],
+  cronExpression: [{ required: true, message: 'cron不能为空', trigger: 'blur' }],
+  misfirePolicy: [{ required: true, message: '策略不能为空', trigger: 'blur' }],
+
+})
 
 // 打开弹窗
 const openDialog = (id: string) => {