From 1b2c2b4257de303e32e24c397635a9e5f8d3b65f Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 21 Jul 2022 16:51:58 +0800
Subject: [PATCH] fix: datetimerange type error

---
 yudao-ui-admin-vue3/src/views/system/dept/index.vue                       |  5 +++--
 yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts          | 17 ++---------------
 yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts            | 17 ++---------------
 yudao-ui-admin-vue3/src/views/system/menu/index.vue                       | 20 +++++++++++---------
 yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue              | 12 +++++++++++-
 yudao-ui-admin-vue3/src/views/system/operatelog/index.vue                 |  2 +-
 yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts        | 42 +++++++++++++++++++++---------------------
 yudao-ui-admin-vue3/src/views/system/role/role.data.ts                    |  7 +++++--
 yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts   | 17 ++---------------
 yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts           | 14 ++------------
 yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts | 17 ++---------------
 11 files changed, 62 insertions(+), 108 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/views/system/dept/index.vue b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
index 1bef630..8f3c8fb 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
@@ -29,10 +29,10 @@ const formRef = ref<FormExpose>()
 
 // ========== 创建部门树结构 ==========
 const filterText = ref('')
-const deptOptions = ref([]) // 树形结构
+const deptOptions = ref() // 树形结构
 const treeRef = ref<InstanceType<typeof ElTree>>()
 const getTree = async () => {
-  const res = await DeptApi.listSimpleDeptApi()
+  const res = await DeptApi.getDeptPageApi(null)
   deptOptions.value = handleTree(res)
 }
 const filterNode = (value: string, data: Tree) => {
@@ -118,6 +118,7 @@ onMounted(async () => {
           :highlight-current="true"
           default-expand-all
           :filter-node-method="filterNode"
+          :expand-on-click-node="false"
         >
           <template #default="{ node, data }">
             <span class="custom-tree-node">
diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
index e9a4f73..3d9893c 100644
--- a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
@@ -56,26 +56,13 @@ const crudSchemas = reactive<CrudSchema[]>([
     field: 'createTime',
     form: {
       show: false
-    }
-  },
-  {
-    label: t('common.createTime'),
-    field: 'daterange',
-    table: {
-      show: false
-    },
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
     },
     search: {
       show: true,
       component: 'DatePicker',
       componentProps: {
-        type: 'daterange',
-        valueFormat: 'YYYY-MM-DD'
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts b/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
index 2a38fc4..8955d66 100644
--- a/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
@@ -54,26 +54,13 @@ const crudSchemas = reactive<CrudSchema[]>([
     field: 'createTime',
     form: {
       show: false
-    }
-  },
-  {
-    label: t('common.createTime'),
-    field: 'daterange',
-    table: {
-      show: false
-    },
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
     },
     search: {
       show: true,
       component: 'DatePicker',
       componentProps: {
-        type: 'daterange',
-        valueFormat: 'YYYY-MM-DD'
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/menu/index.vue b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
index 36aed04..f4b1378 100644
--- a/yudao-ui-admin-vue3/src/views/system/menu/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
@@ -16,10 +16,10 @@ import {
   ElInput,
   ElInputNumber,
   ElSelect,
+  ElTreeSelect,
   ElOption,
   ElMessageBox,
   ElMessage,
-  ElCascader,
   ElRadioGroup,
   ElRadioButton
 } from 'element-plus'
@@ -41,10 +41,13 @@ const menuProps = {
   label: 'name',
   value: 'id'
 }
-const menuOptions = ref([]) // 树形结构
+const menuOptions = ref() // 树形结构
 const getTree = async () => {
   const res = await MenuApi.listSimpleMenusApi()
-  menuOptions.value = handleTree(res)
+  const menu = { id: 0, name: '主类目', children: [] }
+  menu.children = handleTree(res)
+  console.info(menu)
+  menuOptions.value = menu
 }
 // ========== 查询 ==========
 const queryParams = reactive({
@@ -264,13 +267,12 @@ onMounted(async () => {
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="上级菜单">
-            <el-cascader
-              :options="menuData"
-              :props="menuProps"
-              placeholder="请选择上级菜单"
+            <el-tree-select
+              node-key="id"
               v-model="menuForm.parentId"
-              class="w-100"
-              clearable
+              :props="menuProps"
+              :data="menuData"
+              check-strictly
             />
           </el-form-item>
         </el-col>
diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
index f29d855..607cf9b 100644
--- a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, unref } from 'vue'
 import dayjs from 'dayjs'
-import { ElMessage, ElImage } from 'element-plus'
+import { ElMessage, ElImage, ElTag } from 'element-plus'
 import { DICT_TYPE } from '@/utils/dict'
 import { useTable } from '@/hooks/web/useTable'
 import { useI18n } from '@/hooks/web/useI18n'
@@ -118,6 +118,16 @@ getList()
       <template #status="{ row }">
         <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
       </template>
+      <template #authorizedGrantTypes="{ row }">
+        <el-tag
+          :disable-transitions="true"
+          :key="index"
+          v-for="(authorizedGrantType, index) in row.authorizedGrantTypes"
+          :index="index"
+        >
+          {{ authorizedGrantType }}
+        </el-tag>
+      </template>
       <template #createTime="{ row }">
         <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
       </template>
diff --git a/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue b/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
index 2880770..2d863f2 100644
--- a/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
@@ -68,7 +68,7 @@ getList()
         <span>{{ row.resultCode === 0 ? '成功' : '失败' }}</span>
       </template>
       <template #startTime="{ row }">
-        <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
+        <span>{{ dayjs(row.startTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
       </template>
       <template #action="{ row }">
         <el-button link type="primary" @click="handleDetail(row)">
diff --git a/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts b/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
index 02c69eb..bef0576 100644
--- a/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
@@ -41,7 +41,10 @@ const crudSchemas = reactive<CrudSchema[]>([
   },
   {
     label: '操作人员',
-    field: 'userNickname'
+    field: 'userNickname',
+    search: {
+      show: true
+    }
   },
   {
     label: '操作明细',
@@ -63,41 +66,38 @@ const crudSchemas = reactive<CrudSchema[]>([
   },
   {
     label: '操作结果',
-    field: 'resultCode'
-  },
-  {
-    label: '操作日期',
-    field: 'startTime',
-    form: {
-      show: false
+    field: 'resultCode',
+    search: {
+      show: true,
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '成功', value: true },
+          { label: '失败', value: false }
+        ]
+      }
     }
   },
   {
-    label: '执行时长',
-    field: 'duration'
-  },
-  {
     label: '操作日期',
-    field: 'daterange',
-    table: {
-      show: false
-    },
+    field: 'startTime',
     form: {
       show: false
     },
-    detail: {
-      show: false
-    },
     search: {
       show: true,
       component: 'DatePicker',
       componentProps: {
-        type: 'daterange',
-        valueFormat: 'YYYY-MM-DD'
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },
   {
+    label: '执行时长',
+    field: 'duration'
+  },
+  {
     label: t('table.action'),
     field: 'action',
     width: '120px',
diff --git a/yudao-ui-admin-vue3/src/views/system/role/role.data.ts b/yudao-ui-admin-vue3/src/views/system/role/role.data.ts
index 52d0b3f..8309ac5 100644
--- a/yudao-ui-admin-vue3/src/views/system/role/role.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/role/role.data.ts
@@ -65,12 +65,15 @@ const crudSchemas = reactive<CrudSchema[]>([
     form: {
       show: false
     },
+    detail: {
+      show: false
+    },
     search: {
       show: true,
       component: 'DatePicker',
       componentProps: {
-        type: 'daterange',
-        valueFormat: 'YYYY-MM-DD'
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
index 69417d1..e51ac93 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
@@ -66,26 +66,13 @@ const crudSchemas = reactive<CrudSchema[]>([
     field: 'createTime',
     form: {
       show: false
-    }
-  },
-  {
-    label: t('common.createTime'),
-    field: 'daterange',
-    table: {
-      show: false
-    },
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
     },
     search: {
       show: true,
       component: 'DatePicker',
       componentProps: {
-        type: 'daterange',
-        valueFormat: 'YYYY-MM-DD'
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
index 5b4bb39..961ba78 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
@@ -79,23 +79,13 @@ const crudSchemas = reactive<CrudSchema[]>([
     field: 'createTime',
     form: {
       show: false
-    }
-  },
-  {
-    label: '接收时间',
-    field: 'daterange',
-    table: {
-      show: false
-    },
-    form: {
-      show: false
     },
     search: {
       show: true,
       component: 'DatePicker',
       componentProps: {
-        type: 'daterange',
-        valueFormat: 'YYYY-MM-DD'
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
index 3b6a7a6..aab42c1 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
@@ -77,26 +77,13 @@ const crudSchemas = reactive<CrudSchema[]>([
     field: 'createTime',
     form: {
       show: false
-    }
-  },
-  {
-    label: t('common.createTime'),
-    field: 'daterange',
-    table: {
-      show: false
-    },
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
     },
     search: {
       show: true,
       component: 'DatePicker',
       componentProps: {
-        type: 'daterange',
-        valueFormat: 'YYYY-MM-DD'
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },
--
libgit2 0.21.4