Merge branch 'dev' into feature/springdoc

xingyu
2 parents cba69e94 1fd90564
Showing 13 changed files with 85 additions and 64 deletions
yudao-ui-admin-vue3/package.json
yudao-ui-admin-vue3/src/api/login/index.ts
yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
yudao-ui-admin-vue3/src/components/UploadFile/src/UploadFile.vue
yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue
yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
yudao-ui-admin-vue3/src/store/modules/dict.ts
yudao-ui-admin-vue3/src/store/modules/user.ts
yudao-ui-admin-vue3/src/utils/dict.ts
yudao-ui-admin-vue3/src/views/Home/echarts-data.ts
yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts
yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts
 {
   "name": "yudao-ui-admin-vue3",
-  "version": "1.6.6-snapshot.1912",
+  "version": "1.6.6-snapshot.1921",
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,
@@ -33,7 +33,7 @@ export const getTenantIdByNameApi = (name: string) =&gt; {
 // 登出
 export const loginOutApi = () => {
-  return request.delete({ url: '/system/auth/logout' })
+  return request.post({ url: '/system/auth/logout' })
 }
 // 获取用户权限信息
@@ -25,7 +25,7 @@ const props = defineProps({
     default: () => []
   },
   data: {
-    type: Object as PropType<Recordable>,
+    type: Object as PropType<any>,
     default: () => ({})
   }
 })
@@ -17,6 +17,9 @@ const getDictObj = (dictType: string, value: string) =&gt; {
   const dictOptions = getDictOptions(dictType)
   dictOptions.forEach((dict: DictDataType) => {
     if (dict.value === value) {
+      if (dict.colorType + '' === 'primary' || dict.colorType + '' === 'default') {
+        dict.colorType = ''
+      }
       dictData.value = dict
     }
   })
@@ -31,25 +34,11 @@ onUpdated(() =&gt; {
 })
 </script>
 <template>
-  <!-- 默认样式 -->
-  <span
-    v-if="
-      dictData?.colorType === 'default' ||
-      dictData?.colorType === '' ||
-      dictData?.colorType === undefined
-    "
-    :key="dictData?.value.toString()"
-    :class="dictData?.cssClass"
-  >
-    {{ dictData?.label }}
-  </span>
-  <!-- Tag 样式 -->
   <ElTag
-    v-else
     :disable-transitions="true"
     :key="dictData?.value + ''"
-    :type="dictData?.colorType === 'primary' ? 'success' : dictData?.colorType"
-    :class="dictData?.cssClass"
+    :type="dictData?.colorType"
+    :color="dictData?.cssClass"
   >
     {{ dictData?.label }}
   </ElTag>
@@ -99,6 +99,9 @@ const beforeUpload: UploadProps[&#39;beforeUpload&#39;] = (file: UploadRawFile) =&gt; {
 // 文件上传成功
 const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => {
   message.success('上传成功')
+  const fileListNew = fileList.value
+  fileListNew.pop()
+  fileList.value = fileListNew
   uploadList.value.push({ name: res.data, url: res.data })
   if (uploadList.value.length == uploadNumber.value) {
     fileList.value = fileList.value.concat(uploadList.value)
@@ -120,7 +120,7 @@ const getColumnsConfig = (options: XTableProps) =&gt; {
 const getProxyConfig = (options: XTableProps) => {
   const { getListApi, proxyConfig, data, isList } = options
   if (proxyConfig || data) return
-  if (getListApi && isFunction(getListApi) && !isList) {
+  if (getListApi && isFunction(getListApi)) {
     if (!isList) {
       options.proxyConfig = {
         seq: true, // 启用动态序号代理（分页之后索引自动计算为当前页的起始序号）
@@ -194,7 +194,8 @@ const getProxyConfig = (options: XTableProps) =&gt; {
 // 分页
 const getPageConfig = (options: XTableProps) => {
-  const { pagination, pagerConfig, treeConfig } = options
+  const { pagination, pagerConfig, treeConfig, isList } = options
+  if (isList) return
   if (treeConfig) {
     options.treeConfig = options.treeConfig
     return
@@ -35,7 +35,7 @@ const loginOut = () =&gt; {
     type: 'warning'
   })
     .then(async () => {
-      userStore.loginOut()
+      await userStore.loginOut()
       tagsViewStore.delAllViews()
       replace('/login?redirect=/index')
     })
@@ -65,6 +65,29 @@ export const useDictStore = defineStore(&#39;dict&#39;, {
         this.isSetDict = true
         wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
       }
+    },
+    async resetDict() {
+      wsCache.delete(CACHE_KEY.DICT_CACHE)
+      const res = await listSimpleDictDataApi()
+      // 设置数据
+      const dictDataMap = new Map<string, any>()
+      res.forEach((dictData: DictDataVO) => {
+        // 获得 dictType 层级
+        const enumValueObj = dictDataMap[dictData.dictType]
+        if (!enumValueObj) {
+          dictDataMap[dictData.dictType] = []
+        }
+        // 处理 dictValue 层级
+        dictDataMap[dictData.dictType].push({
+          value: dictData.value,
+          label: dictData.label,
+          colorType: dictData.colorType,
+          cssClass: dictData.cssClass
+        })
+      })
+      this.dictMap = dictDataMap
+      this.isSetDict = true
+      wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
     }
   }
 })
@@ -2,7 +2,7 @@ import { store } from &#39;../index&#39;
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { getInfoApi } from '@/api/login'
+import { getInfoApi, loginOutApi } from '@/api/login'
 const { wsCache } = useCache()
@@ -59,7 +59,8 @@ export const useUserStore = defineStore(&#39;admin-user&#39;, {
       this.isSetUser = true
       wsCache.set(CACHE_KEY.USER, userInfo)
     },
-    loginOut() {
+    async loginOut() {
+      await loginOutApi()
       removeToken()
       wsCache.clear()
       this.resetState()
@@ -16,7 +16,7 @@ export interface DictDataType {
   dictType: string
   label: string
   value: string | number | boolean
-  colorType: ElementPlusInfoType | '' | 'default' | 'primary'
+  colorType: ElementPlusInfoType | ''
   cssClass: string
 }
 import { EChartsOption } from 'echarts'
 import { useI18n } from '@/hooks/web/useI18n'
-import { EChartsOption as EChartsWordOption } from 'echarts-wordcloud'
 const { t } = useI18n()
@@ -185,7 +184,7 @@ export const radarOption: EChartsOption = {
   ]
 }
-export const wordOptions: EChartsWordOption = {
+export const wordOptions = {
   series: [
     {
       type: 'wordCloud',
@@ -7,7 +7,7 @@ import { VxeCrudSchema, useVxeCrudSchemas } from &#39;@/hooks/web/useVxeCrudSchemas&#39;
 const { t } = useI18n()
 // 表单校验
 export const dictDataRules = reactive({
-  title: [required],
+  label: [required],
   value: [required],
   sort: [required]
 })
@@ -34,42 +34,48 @@ export const crudSchemas = reactive&lt;VxeCrudSchema&gt;({
       title: '数据键值',
       field: 'value'
     },
+    // {
+    //   title: '标签类型',
+    //   field: 'colorType',
+    //   form: {
+    //     component: 'Select',
+    //     componentProps: {
+    //       options: [
+    //         {
+    //           label: 'default',
+    //           value: ''
+    //         },
+    //         {
+    //           label: 'success',
+    //           value: 'success'
+    //         },
+    //         {
+    //           label: 'info',
+    //           value: 'info'
+    //         },
+    //         {
+    //           label: 'warning',
+    //           value: 'warning'
+    //         },
+    //         {
+    //           label: 'danger',
+    //           value: 'danger'
+    //         }
+    //       ]
+    //     }
+    //   },
+    //   isTable: false
+    // },
     {
-      title: '颜色类型',
-      field: 'colorType',
+      title: '颜色',
+      field: 'cssClass',
+      isTable: false,
       form: {
-        component: 'Select',
+        component: 'ColorPicker',
         componentProps: {
-          options: [
-            {
-              label: 'default',
-              value: ''
-            },
-            {
-              label: 'success',
-              value: 'success'
-            },
-            {
-              label: 'info',
-              value: 'info'
-            },
-            {
-              label: 'warning',
-              value: 'warning'
-            },
-            {
-              label: 'danger',
-              value: 'danger'
-            }
-          ]
+          predefine: ['#ffffff', '#409eff', '#67c23a', '#e6a23c', '#f56c6c', '#909399', '#c71585']
         }
-      },
-      isTable: false
-    },
-    {
-      title: 'CSS Class',
-      field: 'cssClass',
-      isTable: false
+      }
     },
     {
       title: '显示排序',
@@ -7,7 +7,8 @@ const { t } = useI18n() // 国际化
 // 表单校验
 export const dictTypeRules = reactive({
-  name: [required]
+  name: [required],
+  type: [required]
 })
 // 新增 + 修改
 const crudSchemas = reactive<VxeCrudSchema>({
@@ -41,9 +42,7 @@ const crudSchemas = reactive&lt;VxeCrudSchema&gt;({
       field: 'createTime',
       formatter: 'formatDate',
       isForm: false,
-      table: {
-        width: 150
-      },
+      isTable: false,
       search: {
         show: true,
         itemRender: {