Compare commits

..

No commits in common. "04bc68c3ce3e5370169df0d32e485cca8e7ec129" and "82349ba28b5bb5963b0bc69fdbd7dd92d981ae7c" have entirely different histories.

8 changed files with 18 additions and 70 deletions

View File

@ -81,8 +81,8 @@
</SettingItem>
</SettingItemBox>
<SettingItemBox name="鼠标悬停聚焦">
<SettingItem name="禁用(预览可见)">
<SettingItemBox name="悬浮 (预览可见)">
<SettingItem name="禁用">
<n-space>
<n-switch v-model:value="seriesList[1].emphasis.disabled" size="small"></n-switch>
</n-space>

View File

@ -1,11 +1,5 @@
<template>
<n-modal
class="go-chart-data-pond-control"
v-model:show="modelShowRef"
:mask-closable="false"
:close-on-esc="true"
:onEsc="onEsc"
>
<n-modal class="go-chart-data-pond-control" v-model:show="modelShowRef" :mask-closable="false" :close-on-esc="false">
<n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 900px; height: 650px">
<template #header></template>
<template #header-extra> </template>
@ -35,10 +29,7 @@
</n-icon>
</template>
</n-button>
<div>
<n-button class="go-mr-3" @click="closeHandle">取消</n-button>
<n-button type="primary" @click="closeAndSendHandle">保存 & 发送请求</n-button>
</div>
<n-button type="primary" @click="closeHandle">保存 & 发送请求</n-button>
</n-space>
</template>
</n-card>
@ -91,12 +82,9 @@ const pondData = computed(() => {
return data[0]
})
watch(
() => props.modelShow,
newValue => {
modelShowRef.value = newValue
}
)
watch(() => props.modelShow, (newValue) => {
modelShowRef.value = newValue
})
watch(
() => pondData.value,
@ -201,7 +189,7 @@ const deletePond = (targetData: RequestDataPondItemType) => {
}
//
const closeAndSendHandle = () => {
const closeHandle = () => {
//
if (pondData.value) {
targetData.value.request = {
@ -212,14 +200,6 @@ const closeAndSendHandle = () => {
emit('update:modelShow', false)
emit('sendHandle')
}
const closeHandle = () => {
emit('update:modelShow', false)
}
const onEsc = () => {
closeHandle()
}
</script>
<style lang="scss" scoped>

View File

@ -10,11 +10,7 @@
>
<!-- 源地址 -->
<setting-item name="前置 URL">
<n-input
v-model:value.trim="requestOriginUrl"
:disabled="editDisabled"
placeholder="例http://127.0.0.1/"
></n-input>
<n-input v-model:value.trim="requestOriginUrl" :disabled="editDisabled" placeholder="例http://127.0.0.1/"></n-input>
</setting-item>
<setting-item name="更新间隔,为 0 只会初始化">
<n-input-group>

View File

@ -1,11 +1,5 @@
<template>
<n-modal
class="go-chart-data-request"
v-model:show="modelShowRef"
:mask-closable="false"
:closeOnEsc="true"
:onEsc="onEsc"
>
<n-modal class="go-chart-data-request" v-model:show="modelShowRef" :mask-closable="false" :closeOnEsc="false">
<n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 1000px; height: 800px">
<template #header></template>
<template #header-extra> </template>
@ -27,10 +21,7 @@
{{ requestContentTypeObj[requestContentType] }}
</n-tag>
</div>
<div>
<n-button class="go-mr-3" @click="closeHandle">取消</n-button>
<n-button type="primary" @click="closeAndSendHandle"> {{ saveBtnText || '保存 & 发送请求' }}</n-button>
</div>
<n-button type="primary" @click="closeAndSendHandle"> {{ saveBtnText || '保存 & 发送请求' }}</n-button>
</n-space>
</template>
</n-card>
@ -79,10 +70,6 @@ const closeAndSendHandle = () => {
emit('update:modelShow', false)
emit('sendHandle')
}
const onEsc = () => {
closeHandle()
}
</script>
<style lang="scss" scoped>

View File

@ -1,11 +1,5 @@
<template>
<n-modal
class="go-chart-data-request"
v-model:show="modelShowRef"
:mask-closable="false"
:closeOnEsc="true"
:onEsc="onEsc"
>
<n-modal class="go-chart-data-request" v-model:show="modelShowRef" :mask-closable="false" :closeOnEsc="false">
<n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 1000px; height: 800px">
<template #header></template>
<template #header-extra> </template>
@ -23,7 +17,7 @@
<template #action>
<n-space justify="space-between">
<n-space v-if="targetDataRequest">
<n-tag :bordered="false" type="primary">名称</n-tag>
<n-tag :bordered="false" type="primary">名称</n-tag>
<n-input
v-model:value="targetDataRequest.dataPondName"
ref="inputInstRef"
@ -66,12 +60,10 @@ const pondName = ref()
const inputInstRef = ref()
const modelShowRef = ref(false)
watch(
() => props.modelShow,
newValue => {
modelShowRef.value = newValue
}
)
watch(() => props.modelShow, (newValue) => {
modelShowRef.value = newValue
})
const closeHandle = () => {
emit('update:modelShow', false)
@ -93,10 +85,6 @@ const closeAndSendHandle = () => {
}
})
}
const onEsc = () => {
closeHandle()
}
</script>
<style lang="scss" scoped>

View File

@ -148,7 +148,6 @@ $max-width: 670px;
min-width: $min-width;
min-width: $max-width;
padding: 0 10px;
padding-left: 20px;
display: flex;
align-items: center;
justify-content: space-between;

View File

@ -56,7 +56,6 @@
type="text"
maxlength="16"
:placeholder="$t('global.form_account')"
@keydown.enter="handleSubmit"
>
<template #prefix>
<n-icon size="18">
@ -72,7 +71,6 @@
maxlength="16"
show-password-on="click"
:placeholder="$t('global.form_password')"
@keydown.enter="handleSubmit"
>
<template #prefix>
<n-icon size="18">

View File

@ -1,8 +1,8 @@
<template>
<!-- mask-closable 暂时是失效的不知道为啥 -->
<n-modal
class="go-modal-box"
v-model:show="showRef"
:mask-closable="true"
@afterLeave="closeHandle"
>
<n-card hoverable size="small">