From 4e341517d907c66d93486be1351a267d763b4f5e Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 21 Mar 2023 22:47:30 +0800
Subject: [PATCH] feat: views

---
 .../Table/src/components/TableAction.vue      |   4 +-
 .../Table/src/hooks/useTableForm.ts           |   1 +
 .../Tree/src/components/TreeHeader.vue        |   2 +-
 .../setting/components/InputNumberItem.vue    |   2 +-
 .../default/setting/components/SelectItem.vue |   9 +-
 src/layouts/default/tabs/index.vue            |   1 -
 src/utils/http/axios/Axios.ts                 |   5 +-
 src/views/system/errorCode/index.vue          |   2 +-
 src/views/system/menu/index.vue               |   2 +-
 src/views/system/notice/index.vue             |   2 +-
 src/views/system/operatelog/index.vue         |  42 ++++++-
 .../system/operatelog/operateLog.data.ts      | 106 ++++++++++++++++++
 src/views/system/post/index.vue               |   2 +-
 src/views/system/role/index.vue               |   6 +-
 src/views/system/sensitiveWord/index.vue      |   2 +-
 src/views/system/user/index.vue               |  17 +--
 src/views/system/user/user.data.ts            |   8 +-
 17 files changed, 174 insertions(+), 39 deletions(-)
 create mode 100644 src/views/system/operatelog/operateLog.data.ts

diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue
index c1f649d2..194f813c 100644
--- a/src/components/Table/src/components/TableAction.vue
+++ b/src/components/Table/src/components/TableAction.vue
@@ -15,9 +15,7 @@
     </template>
     <Dropdown :trigger="['hover']" :dropMenuList="getDropdownList" popconfirm v-if="dropDownActions && getDropdownList.length > 0">
       <slot name="more"></slot>
-      <a-button type="link" size="small" v-if="!$slots.more">
-        <MoreOutlined class="icon-more" />
-      </a-button>
+      <a-button type="link" v-if="!$slots.more"> 更多<MoreOutlined class="icon-more" /> </a-button>
     </Dropdown>
   </div>
 </template>
diff --git a/src/components/Table/src/hooks/useTableForm.ts b/src/components/Table/src/hooks/useTableForm.ts
index 1af5b499..badba616 100644
--- a/src/components/Table/src/hooks/useTableForm.ts
+++ b/src/components/Table/src/hooks/useTableForm.ts
@@ -36,6 +36,7 @@ export function useTableForm(
     if (handleSearchInfoFn && isFunction(handleSearchInfoFn)) {
       info = handleSearchInfoFn(info) || info
     }
+    console.info(info)
     fetch({ searchInfo: info, page: 1 })
   }
 
diff --git a/src/components/Tree/src/components/TreeHeader.vue b/src/components/Tree/src/components/TreeHeader.vue
index b7fb6abc..4a06a677 100644
--- a/src/components/Tree/src/components/TreeHeader.vue
+++ b/src/components/Tree/src/components/TreeHeader.vue
@@ -6,7 +6,7 @@
     </BasicTitle>
     <div class="flex items-center flex-1 cursor-pointer justify-self-stretch" v-if="search || toolbar">
       <div :class="getInputSearchCls" v-if="search">
-        <InputSearch :placeholder="t('common.searchText')" size="small" allowClear v-model:value="searchValue" />
+        <InputSearch :placeholder="t('common.searchText')" allowClear v-model:value="searchValue" />
       </div>
       <Dropdown @click.prevent v-if="toolbar">
         <Icon icon="ion:ellipsis-vertical" />
diff --git a/src/layouts/default/setting/components/InputNumberItem.vue b/src/layouts/default/setting/components/InputNumberItem.vue
index 4171f270..51012645 100644
--- a/src/layouts/default/setting/components/InputNumberItem.vue
+++ b/src/layouts/default/setting/components/InputNumberItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="prefixCls">
     <span> {{ title }}</span>
-    <InputNumber v-bind="$attrs" size="small" :class="`${prefixCls}-input-number`" @change="handleChange" />
+    <InputNumber v-bind="$attrs" :class="`${prefixCls}-input-number`" @change="handleChange" />
   </div>
 </template>
 <script lang="ts" setup name="InputNumberItem">
diff --git a/src/layouts/default/setting/components/SelectItem.vue b/src/layouts/default/setting/components/SelectItem.vue
index 3b6c1451..67ca5cfc 100644
--- a/src/layouts/default/setting/components/SelectItem.vue
+++ b/src/layouts/default/setting/components/SelectItem.vue
@@ -1,14 +1,7 @@
 <template>
   <div :class="prefixCls">
     <span> {{ title }}</span>
-    <Select
-      v-bind="getBindValue"
-      :class="`${prefixCls}-select`"
-      @change="handleChange as any"
-      :disabled="disabled"
-      size="small"
-      :options="options"
-    />
+    <Select v-bind="getBindValue" :class="`${prefixCls}-select`" @change="handleChange as any" :disabled="disabled" :options="options" />
   </div>
 </template>
 <script lang="ts" setup name="SelectItem">
diff --git a/src/layouts/default/tabs/index.vue b/src/layouts/default/tabs/index.vue
index 06b9c25c..bbd49dde 100644
--- a/src/layouts/default/tabs/index.vue
+++ b/src/layouts/default/tabs/index.vue
@@ -2,7 +2,6 @@
   <div :class="getWrapClass">
     <Tabs
       type="editable-card"
-      size="small"
       :animated="false"
       :hideAdd="true"
       :tabBarGutter="3"
diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
index 20d0170a..e42fa204 100644
--- a/src/utils/http/axios/Axios.ts
+++ b/src/utils/http/axios/Axios.ts
@@ -124,8 +124,11 @@ export class VAxios {
               })
               requestList = []
               // TODO
-              // res = await Promise.all([this.axiosInstance(config)])[0]
               console.info('刷新令牌end', res)
+              return new Promise((resolve) => {
+                resolve(this.axiosInstance(config))
+              })
+              // res = await Promise.all([this.axiosInstance(config)])[0]
             } catch (e) {
               console.info(e)
               requestList.forEach((cb: any) => {
diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue
index ff660575..45acd72a 100644
--- a/src/views/system/errorCode/index.vue
+++ b/src/views/system/errorCode/index.vue
@@ -56,7 +56,7 @@ const [registerTable, { getForm, reload }] = useTable({
   showTableSetting: true,
   showIndexColumn: false,
   actionColumn: {
-    width: 120,
+    width: 160,
     title: '操作',
     dataIndex: 'action',
     fixed: 'right'
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b21e4dae..9ea52a7c 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -63,7 +63,7 @@ const [register, { expandAll, collapseAll, getForm, reload }] = useTable({
   showIndexColumn: false,
   canResize: false,
   actionColumn: {
-    width: 120,
+    width: 160,
     title: '操作',
     dataIndex: 'action',
     fixed: 'right'
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 6d3558d9..a15e2ea1 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -53,7 +53,7 @@ const [registerTable, { reload }] = useTable({
   showTableSetting: true,
   showIndexColumn: false,
   actionColumn: {
-    width: 120,
+    width: 160,
     title: '操作',
     dataIndex: 'action',
     fixed: 'right'
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index 3b64cfc4..088955ab 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -1,3 +1,43 @@
 <template>
-  <div>开发中</div>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #toolbar>
+        <a-button type="warning" @click="handleExport"> 导出 </a-button>
+      </template>
+    </BasicTable>
+  </div>
 </template>
+<script lang="ts" setup name="OperateLog">
+import { BasicTable, useTable } from '@/components/Table'
+import { OperateLogPageReqVO, exportOperateLogApi, getOperateLogPageApi } from '@/api/system/operatelog'
+import { columns, searchFormSchema } from './operateLog.data'
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+
+const { t } = useI18n()
+const { createConfirm, createMessage } = useMessage()
+const [registerTable, { getForm }] = useTable({
+  title: '操作日志列表',
+  api: getOperateLogPageApi,
+  columns,
+  formConfig: {
+    labelWidth: 120,
+    schemas: searchFormSchema
+  },
+  useSearchForm: true,
+  showTableSetting: true,
+  showIndexColumn: false
+})
+
+async function handleExport() {
+  createConfirm({
+    title: '导出',
+    iconType: 'warning',
+    content: '是否要导出数据？',
+    async onOk() {
+      await exportOperateLogApi(getForm().getFieldsValue() as OperateLogPageReqVO)
+      createMessage.success(t('common.exportSuccessText'))
+    }
+  })
+}
+</script>
diff --git a/src/views/system/operatelog/operateLog.data.ts b/src/views/system/operatelog/operateLog.data.ts
new file mode 100644
index 00000000..9a0b7051
--- /dev/null
+++ b/src/views/system/operatelog/operateLog.data.ts
@@ -0,0 +1,106 @@
+import { getIntDictOptions } from './../../../utils/dict'
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE } from '@/utils/dict'
+import { h } from 'vue'
+
+export const columns: BasicColumn[] = [
+  {
+    title: '日志编号',
+    dataIndex: 'id',
+    width: 100
+  },
+  {
+    title: '操作模块',
+    dataIndex: 'module',
+    width: 120
+  },
+  {
+    title: '操作名',
+    dataIndex: 'name',
+    width: 180
+  },
+  {
+    title: '操作类型',
+    dataIndex: 'type',
+    width: 180,
+    customRender: ({ text }) => {
+      return useRender.renderDict(text, DICT_TYPE.SYSTEM_OPERATE_TYPE)
+    }
+  },
+  {
+    title: '操作人',
+    dataIndex: 'userNickname',
+    width: 120
+  },
+  {
+    title: 'userAgent',
+    dataIndex: 'userAgent',
+    width: 400
+  },
+  {
+    title: '操作结果',
+    dataIndex: 'resultCode',
+    width: 180,
+    customRender: ({ text }) => {
+      return h('span', text === 0 ? '成功' : '失败')
+    }
+  },
+  {
+    title: '操作日期',
+    dataIndex: 'startTime',
+    width: 180,
+    customRender: ({ text }) => {
+      return useRender.renderDate(text)
+    }
+  },
+  {
+    title: '执行时长',
+    dataIndex: 'duration',
+    width: 180,
+    customRender: ({ text }) => {
+      return h('span', text + 'ms')
+    }
+  }
+]
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '系统模块',
+    field: 'title',
+    component: 'Input',
+    colProps: { span: 8 }
+  },
+  {
+    label: '操作人员',
+    field: 'operName',
+    component: 'Input',
+    colProps: { span: 8 }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    component: 'Select',
+    componentProps: {
+      options: getIntDictOptions(DICT_TYPE.SYSTEM_OPERATE_TYPE)
+    },
+    colProps: { span: 8 }
+  },
+  {
+    label: '状态',
+    field: 'success',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { value: true, key: true, label: '成功' },
+        { value: false, key: false, label: '失败' }
+      ]
+    },
+    colProps: { span: 8 }
+  },
+  {
+    label: '操作时间',
+    field: 'startTime',
+    component: 'RangePicker',
+    colProps: { span: 8 }
+  }
+]
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 778ef3fb..797cb5eb 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -56,7 +56,7 @@ const [registerTable, { getForm, reload }] = useTable({
   showTableSetting: true,
   showIndexColumn: false,
   actionColumn: {
-    width: 120,
+    width: 160,
     title: '操作',
     dataIndex: 'action',
     fixed: 'right'
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 77519787..e553b3b5 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -13,7 +13,9 @@
                 icon: 'clarity:note-edit-line',
                 label: '修改',
                 onClick: handleEdit.bind(null, record)
-              },
+              }
+            ]"
+            :dropDownActions="[
               {
                 icon: 'clarity:note-edit-line',
                 label: '菜单权限',
@@ -66,7 +68,7 @@ const [registerTable, { getForm, reload }] = useTable({
   showTableSetting: true,
   showIndexColumn: false,
   actionColumn: {
-    width: 240,
+    width: 160,
     title: '操作',
     dataIndex: 'action',
     fixed: 'right'
diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue
index 75283b66..b6066321 100644
--- a/src/views/system/sensitiveWord/index.vue
+++ b/src/views/system/sensitiveWord/index.vue
@@ -61,7 +61,7 @@ const [registerTable, { getForm, reload }] = useTable({
   showTableSetting: true,
   showIndexColumn: false,
   actionColumn: {
-    width: 120,
+    width: 160,
     title: '操作',
     dataIndex: 'action',
     fixed: 'right'
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ee2e9ac7..56b01bf6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -30,7 +30,7 @@
         </template>
       </template>
     </BasicTable>
-    <UserModel @register="registerModal" @success="handleSuccess" />
+    <UserModel @register="registerModal" @success="reload()" />
   </div>
 </template>
 <script lang="ts" setup name="User">
@@ -49,7 +49,7 @@ const { createConfirm, createMessage } = useMessage()
 const [registerModal, { openModal }] = useModal()
 const searchInfo = reactive<Recordable>({})
 
-const [registerTable, { getForm, reload, updateTableDataRecord }] = useTable({
+const [registerTable, { getForm, reload }] = useTable({
   title: '账号列表',
   api: getUserPageApi,
   columns,
@@ -62,7 +62,7 @@ const [registerTable, { getForm, reload, updateTableDataRecord }] = useTable({
   showTableSetting: true,
   showIndexColumn: false,
   actionColumn: {
-    width: 120,
+    width: 160,
     title: '操作',
     dataIndex: 'action',
     fixed: 'right'
@@ -100,17 +100,6 @@ async function handleDelete(record: Recordable) {
   reload()
 }
 
-function handleSuccess({ isUpdate, values }) {
-  if (isUpdate) {
-    // 演示不刷新表格直接更新内部数据。
-    // 注意：updateTableDataRecord要求表格的rowKey属性为string并且存在于每一行的record的keys中
-    const result = updateTableDataRecord(values.id, values)
-    console.log(result)
-  } else {
-    reload()
-  }
-}
-
 function handleSelect(deptId = '') {
   searchInfo.deptId = deptId
   reload()
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index f43ab9b6..5ee15962 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -73,6 +73,9 @@ export const searchFormSchema: FormSchema[] = [
     label: '创建时间',
     field: 'createTime',
     component: 'RangePicker',
+    componentProps: {
+      format: 'YYYY-MM-DD HH:mm:ss'
+    },
     colProps: { span: 8 }
   }
 ]
@@ -121,7 +124,7 @@ export const formSchema: FormSchema[] = [
     label: '用户名称',
     field: 'username',
     component: 'Input',
-    ifShow: ({ values }) => values.id === undefined
+    dynamicDisabled: ({ values }) => values.id !== undefined
   },
   {
     label: '用户密码',
@@ -144,7 +147,8 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       api: () => listSimplePostsApi(),
       labelField: 'name',
-      valueField: 'id'
+      valueField: 'id',
+      mode: 'tags'
     }
   },
   {