blackteay/go-view
1
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into master-fetch-dev

Browse Source
This commit is contained in:
奔跑的面条 2023-04-23 20:07:03 +08:00
commit 0a775af9bb
3 changed files with 323 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hooks/useChartDataFetch.hook.ts
View File

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

5
src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue
View File

@ -130,8 +130,9 @@ const sendHandle = async () => {
const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig)) const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
loading.value = false loading.value = false
if (res) { 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 showMatching.value = true
return return
} }

3
src/views/login/index.vue
View File

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