Merge branch 'dev'

src/api/axios.ts

@@ -21,7 +21,7 @@ axiosInstance.interceptors.request.use(
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
     const { code } = res.data as { code: number }
-    if (code === undefined || code === null) return Promise.resolve(res)
+    if (code === undefined || code === null) return Promise.resolve(res.data)
     if (code === ResultEnum.DATA_SUCCESS) return Promise.resolve(res.data)
     // 重定向
     if (ErrorPageNameMap.get(code)) redirectErrorPage(code)

src/hooks/useChartDataFetch.hook.ts

@@ -76,10 +76,11 @@ export const useChartDataFetch = (
           if (res) {
             try {
               const filter = targetComponent.filter
-              echartsUpdateHandle(newFunctionHandle(res?.data, res, filter))
+              const { data } = res
+              echartsUpdateHandle(newFunctionHandle(data, res, filter))
               // 更新回调函数
               if (updateCallback) {
-                updateCallback(newFunctionHandle(res?.data, res, filter))
+                updateCallback(newFunctionHandle(data, res, filter))
               }
             } catch (error) {
               console.error(error)

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue

@@ -130,8 +130,9 @@ const sendHandle = async () => {
     const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
     loading.value = false
     if (res) {
-      if (!res?.data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
+      const { data } = res
-      targetData.value.option.dataset = newFunctionHandle(res?.data, res, targetData.value.filter)
+      if (!data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式，请配置过滤器！')
+      targetData.value.option.dataset = newFunctionHandle(data, res, targetData.value.filter)
       showMatching.value = true
       return
     }

src/views/login/index.vue

@@ -59,6 +59,8 @@
                 <n-form-item path="username">
                   <n-input
                     v-model:value="formInline.username"
+                    type="text"
+                    maxlength="16"
                     :placeholder="$t('global.form_account')"
                   >
                     <template #prefix>
@@ -72,6 +74,7 @@
                   <n-input
                     v-model:value="formInline.password"
                     type="password"
+                    maxlength="16"
                     show-password-on="click"
                     :placeholder="$t('global.form_password')"
                   >