This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 0f197fa64 [Fix] handle history version error,improve login footer
style (#1957)
0f197fa64 is described below
commit 0f197fa647b3d570bc12186e1d489319753a39cc
Author: Sizhu Wang <[email protected]>
AuthorDate: Thu Nov 3 19:48:40 2022 +0800
[Fix] handle history version error,improve login footer style (#1957)
* [Fix] handle history version error,improve login footer style
* [Fix] select history version bug
---
.../src/assets/svg/apache-incubator.svg | 1 +
.../src/enums/flinkEnum.ts | 24 ++++++
.../src/layouts/default/footer/index.vue | 8 +-
.../src/locales/lang/en/layout.ts | 2 +-
.../src/locales/lang/zh-CN/layout.ts | 2 +-
.../src/settings/siteSetting.ts | 2 +-
.../src/views/base/login/Login.vue | 94 +++++++++++++---------
.../src/views/base/login/LoginSlogan.tsx | 22 ++---
.../src/views/flink/app/EditStreamPark.vue | 1 +
.../flink/app/components/AppDetail/Different.vue | 14 ++--
.../src/views/flink/app/components/Dependency.vue | 1 -
.../src/views/flink/app/data/index.ts | 17 ++--
.../src/views/flink/app/hooks/useEditStreamPark.ts | 11 +--
.../src/views/flink/app/hooks/useFlinkRender.tsx | 22 +++--
.../flink/setting/components/AlertSetting.vue | 2 +-
15 files changed, 143 insertions(+), 80 deletions(-)
diff --git
a/streampark-console/streampark-console-newui/src/assets/svg/apache-incubator.svg
b/streampark-console/streampark-console-newui/src/assets/svg/apache-incubator.svg
new file mode 100644
index 000000000..1b4c36433
--- /dev/null
+++
b/streampark-console/streampark-console-newui/src/assets/svg/apache-incubator.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 473.26
110.22"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{fill-rule:evenodd;}</style></defs><g
id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer
1"><polygon class="cls-1" points="445.81 13.29 467.03 13.29 467.03 15.29 448.03
15.29 448.03 27.09 465.11 27.09 465.11 29.09 448.03 29.09 448.03 41.1 467.24
41.1 467.24 43.11 445.81 43.11 445.81 13.29"/><polygon class="cls-1"
points="377.65 13.29 379.86 13.29 379.86 27.13 3 [...]
\ No newline at end of file
diff --git a/streampark-console/streampark-console-newui/src/enums/flinkEnum.ts
b/streampark-console/streampark-console-newui/src/enums/flinkEnum.ts
index 0893a2ba9..f479e55ad 100644
--- a/streampark-console/streampark-console-newui/src/enums/flinkEnum.ts
+++ b/streampark-console/streampark-console-newui/src/enums/flinkEnum.ts
@@ -21,3 +21,27 @@ export enum BuildEnum {
SUCCESSFUL = 1,
FAILED = 2,
}
+/* ExecutionMode */
+export enum ExecutionModeEnum {
+ /* remote (standalone) */
+ REMOTE = 1,
+ /* yarn per-job (deprecated, please use yarn-application mode) */
+ YARN_PER_JOB = 2,
+ /* yarn session */
+ YARN_SESSION = 3,
+ /* yarn application */
+ YARN_APPLICATION = 4,
+ /* kubernetes session */
+ KUBERNETES_SESSION = 5,
+ /* kubernetes application */
+ KUBERNETES_APPLICATION = 6,
+}
+
+export const executionMap = {
+ REMOTE: ExecutionModeEnum.REMOTE,
+ YARN_PER_JOB: ExecutionModeEnum.YARN_PER_JOB,
+ YARN_SESSION: ExecutionModeEnum.YARN_SESSION,
+ YARN_APPLICATION: ExecutionModeEnum.YARN_APPLICATION,
+ KUBERNETES_SESSION: ExecutionModeEnum.KUBERNETES_SESSION,
+ KUBERNETES_APPLICATION: ExecutionModeEnum.KUBERNETES_APPLICATION,
+};
diff --git
a/streampark-console/streampark-console-newui/src/layouts/default/footer/index.vue
b/streampark-console/streampark-console-newui/src/layouts/default/footer/index.vue
index 726f92b1a..5887e01db 100644
---
a/streampark-console/streampark-console-newui/src/layouts/default/footer/index.vue
+++
b/streampark-console/streampark-console-newui/src/layouts/default/footer/index.vue
@@ -17,13 +17,13 @@
<template>
<Footer :class="prefixCls" v-if="getShowLayoutFooter" ref="footerRef">
<div :class="`${prefixCls}__links`">
- <!-- <a @click="openWindow(SITE_URL)">{{
t('layout.footer.onlinePreview') }}</a> -->
+ <a @click="openWindow(SITE_URL)">{{ t('layout.footer.website') }}</a>
- <GithubFilled @click="openWindow(GITHUB_URL)"
:class="`${prefixCls}__github`" />
+ <GithubFilled :class="`${prefixCls}__github`" />
- <!-- <a @click="openWindow(DOC_URL)">{{
t('layout.footer.onlineDocument') }}</a> -->
+ <a @click="openWindow(DOC_URL)">{{ t('layout.footer.onlineDocument')
}}</a>
</div>
- <div :class="`${prefixCls}__copyright`">
+ <div :class="`${prefixCls}__copyright`"
@click="openWindow('https://incubator.apache.org/')">
Copyright ©{{ new Date().getFullYear() }} The Apache Software
Foundation. Apache
StreamPark, StreamPark, and its feather logo are trademarks of The
Apache Software Foundation
</div>
diff --git
a/streampark-console/streampark-console-newui/src/locales/lang/en/layout.ts
b/streampark-console/streampark-console-newui/src/locales/lang/en/layout.ts
index 304ef7fcf..9410137c2 100644
--- a/streampark-console/streampark-console-newui/src/locales/lang/en/layout.ts
+++ b/streampark-console/streampark-console-newui/src/locales/lang/en/layout.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
export default {
- footer: { onlinePreview: 'Preview', onlineDocument: 'Document' },
+ footer: { website: 'Website', onlineDocument: 'Document' },
header: {
// user dropdown
dropdownItemDoc: 'Document',
diff --git
a/streampark-console/streampark-console-newui/src/locales/lang/zh-CN/layout.ts
b/streampark-console/streampark-console-newui/src/locales/lang/zh-CN/layout.ts
index e39992ac1..d0fa93b32 100644
---
a/streampark-console/streampark-console-newui/src/locales/lang/zh-CN/layout.ts
+++
b/streampark-console/streampark-console-newui/src/locales/lang/zh-CN/layout.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
export default {
- footer: { onlinePreview: '在线预览', onlineDocument: '在线文档' },
+ footer: { website: '官网', onlineDocument: '在线文档' },
header: {
// user dropdown
dropdownItemDoc: '文档',
diff --git
a/streampark-console/streampark-console-newui/src/settings/siteSetting.ts
b/streampark-console/streampark-console-newui/src/settings/siteSetting.ts
index c504d3cbc..fe4e45307 100644
--- a/streampark-console/streampark-console-newui/src/settings/siteSetting.ts
+++ b/streampark-console/streampark-console-newui/src/settings/siteSetting.ts
@@ -18,7 +18,7 @@
export const GITHUB_URL = 'https://github.com/apache/incubator-streampark';
// doc
-export const DOC_URL = 'https://streampark.apache.org';
+export const DOC_URL = 'https://streampark.apache.org/docs/intro';
// site url
export const SITE_URL = 'https://streampark.apache.org';
diff --git
a/streampark-console/streampark-console-newui/src/views/base/login/Login.vue
b/streampark-console/streampark-console-newui/src/views/base/login/Login.vue
index 06b91342d..b5c9a5101 100644
--- a/streampark-console/streampark-console-newui/src/views/base/login/Login.vue
+++ b/streampark-console/streampark-console-newui/src/views/base/login/Login.vue
@@ -15,41 +15,54 @@
limitations under the License.
-->
<template>
- <div
- class="w-full bg-light-200 relative section bg-gradient-primary pb-260px
md:pt-130px px-50px overflow-hidden">
- <div class="overlay bg-gradient-primary !opacity-90 -z-1"></div>
-
- <figure class="scribble scale-4 !opacity-10 top-50 left-0">
- <SvgIcon name="block" class="text-secondary" :size="200" />
- </figure>
-
- <figure class="scribble scale-5 !opacity-10 top-50 left-0">
- <SvgIcon name="block" class="text-secondary" :size="200" />
- </figure>
-
- <figure class="scribble scale-6 !opacity-10 top-50 left-0">
- <SvgIcon name="block" class="text-secondary" :size="200" />
- </figure>
-
- <figure class="scribble scale-7 !opacity-10 top-50 left-0">
- <SvgIcon name="block" class="text-secondary" :size="200" />
- </figure>
- <div class="container px-7 pb-2">
- <Row :gutter="24">
- <Col :md="12" :span="24" class="self-center pr-5 z-100 -enter-x">
- <LoginSlogan />
- </Col>
- <Col :md="12" :span="24">
- <div
- :class="`${prefixCls}-form`"
- class="relative w-auto m-auto max-w-460px px-12
bg-[rgba(0,0,0,0.5)] rounded-5px py-5 shadow-2xl shadow-blue-500 enter-x z-100"
- >
- <LoginForm />
- </div>
- </Col>
- </Row>
- </div>
+ <div class="h-full bg-gradient-primary overflow-auto">
+ <div class="w-full relative h-[calc(100%-120px)] min-h-700px flex
items-center section">
+ <div class="scribble-box w-[80%] h-full absolute overflow-hidden">
+ <figure class="scribble scale-2 !opacity-10 top-50 left-0">
+ <SvgIcon name="block" class="text-secondary" :size="200" />
+ </figure>
+
+ <figure class="scribble scale-3 !opacity-10 top-50 left-0">
+ <SvgIcon name="block" class="text-secondary" :size="200" />
+ </figure>
+ <figure class="scribble scale-4 !opacity-10 top-50 left-0">
+ <SvgIcon name="block" class="text-secondary" :size="200" />
+ </figure>
+
+ <figure class="scribble scale-5 !opacity-10 top-50 left-0">
+ <SvgIcon name="block" class="text-secondary" :size="200" />
+ </figure>
+ </div>
+ <div class="container pb-2">
+ <Row :gutter="24">
+ <Col :md="12" :span="24" class="self-center pr-5 z-100 -enter-x">
+ <LoginSlogan />
+ </Col>
+ <Col :md="12" :span="24">
+ <div
+ :class="`${prefixCls}-form`"
+ class="relative w-auto m-auto max-w-460px px-12
bg-[rgba(0,0,0,0.5)] rounded-5px py-5 shadow-2xl shadow-blue-500 enter-x z-100"
+ >
+ <LoginForm />
+ </div>
+ </Col>
+ </Row>
+ </div>
+ </div>
+ <footer class="w-1150px m-auto text-center bg-transparent opacity-60">
+ <a href="https://incubator.apache.org/"; target="_blank" class="w-200px
m-auto inline-block">
+ <img
+ src="/@/assets/svg/apache-incubator.svg"
+ alt="Apache Incubator logo"
+ class="w-200px my-10px mx-auto"
+ />
+ </a>
+ <p class="text-light-100 pt-10px" style="border-top: 1px solid #dad7d7">
+ Copyright © 2022 The Apache Software Foundation. Apache StreamPark,
StreamPark, and its
+ feather logo are trademarks of The Apache Software Foundation.
+ </p>
+ </footer>
</div>
</template>
<script lang="ts" setup>
@@ -79,7 +92,6 @@
box-shadow: inherit !important;
}
-
.bg-gradient-primary {
background-image: linear-gradient(
130deg,
@@ -110,9 +122,11 @@
border-color: rgba(@active-color, 0.95);
}
}
+
.form-title {
font-family: Poppins, sans-serif !important;
}
+
.text-left {
.ant-btn {
padding: 0px;
@@ -124,34 +138,42 @@
position: relative;
width: 100%;
height: 24vh;
- margin-bottom: -7px; /* 修复 Safari 等浏览器下方空隙 */
+ margin-bottom: -7px;
+ /* 修复 Safari 等浏览器下方空隙 */
min-height: 150px;
max-height: 280px;
width: 100%;
}
+
.parallax > use {
animation: move-forever 25s cubic-bezier(0.55, 0.5, 0.45, 0.5) infinite;
}
+
.parallax > use:nth-child(1) {
animation-delay: -2s;
animation-duration: 7s;
}
+
.parallax > use:nth-child(2) {
animation-delay: -3s;
animation-duration: 8s;
}
+
.parallax > use:nth-child(3) {
animation-delay: -4s;
animation-duration: 9s;
}
+
.parallax > use:nth-child(4) {
animation-delay: -5s;
animation-duration: 10s;
}
+
@keyframes move-forever {
0% {
transform: translate3d(-90px, 0, 0);
}
+
100% {
transform: translate3d(85px, 0, 0);
}
diff --git
a/streampark-console/streampark-console-newui/src/views/base/login/LoginSlogan.tsx
b/streampark-console/streampark-console-newui/src/views/base/login/LoginSlogan.tsx
index 8f1926dbe..5c7c365e4 100644
---
a/streampark-console/streampark-console-newui/src/views/base/login/LoginSlogan.tsx
+++
b/streampark-console/streampark-console-newui/src/views/base/login/LoginSlogan.tsx
@@ -24,7 +24,7 @@ export default defineComponent({
setup() {
return () => {
return (
- <div className="!text-left mt-0">
+ <div className="!text-left w-550px m-auto">
<div className="mb-5 system_info pt-0">
<div className="project_title fw-bold text-white mb-3">
<div
@@ -62,15 +62,19 @@ export default defineComponent({
</p>
</div>
<div className="flex items-center mt-10">
- <a className="btn streamx-btn btn !flex items-center"
+ <a
+ className="btn streamx-btn btn !flex items-center"
href="https://github.com/apache/incubator-streampark";
- target="_blank">
+ target="_blank"
+ >
<Icon icon="ant-design:github-filled"></Icon>
<div> GitHub</div>
</a>
- <a className="btn streamx-btn btn-green !flex items-center ml-10px"
+ <a
+ className="btn streamx-btn btn-green !flex items-center ml-10px"
href="https://streampark.apache.org";
- target="_blank">
+ target="_blank"
+ >
<Icon icon="carbon:document"></Icon>
<div> Document</div>
</a>
@@ -80,12 +84,12 @@ export default defineComponent({
<Tag color="#477de9">Version: v{version}</Tag>
<img
src="https://img.shields.io/github/stars/apache/incubator-streampark.svg?sanitize=true";
- className="wow fadeInUp">
- </img>
+ className="wow fadeInUp"
+ ></img>
<img
src="https://img.shields.io/github/forks/apache/incubator-streampark.svg?sanitize=true";
- className="wow fadeInUp">
- </img>
+ className="wow fadeInUp"
+ ></img>
</div>
</div>
);
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
index 568cb70d7..f815dd1fa 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
@@ -312,6 +312,7 @@
module: res.module,
configId,
sqlId: app.sqlId,
+ flinkSqlHistory: app.sqlId,
versionId: app.versionId,
projectName: app.projectName,
project: app.projectId,
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
index d24b56567..90d01bfa5 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
@@ -35,7 +35,7 @@
const title = ref('edit configuration');
const items = ref<any[]>([]);
-
+ const renderEleMap = new Map<string, boolean>();
const version = reactive({
original: null,
modified: null,
@@ -70,7 +70,11 @@
nextTick(() => {
const elem = document.querySelector(ele);
handleHeight(elem, 140);
- setupEditor(elem);
+ // no render
+ if (!renderEleMap.get(ele)) {
+ setupEditor(elem);
+ renderEleMap.set(ele, true);
+ }
});
}
/* Change editor height */
@@ -84,10 +88,6 @@
closeDrawer();
}
- function handleChangeTab(key: number) {
- handleRenderTab(key);
- }
-
defineExpose({ different });
</script>
<template>
@@ -110,7 +110,7 @@
</a-button>
{{ title }}
</template>
- <Tabs type="card" @change="handleChangeTab">
+ <Tabs type="card" @change="handleRenderTab">
<TabPane v-for="(item, index) in items" :key="index" :tab="item.name">
<div :id="'mergely'.concat(index.toString())"></div>
</TabPane>
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
index 4fce9bc0e..4848cacda 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
@@ -231,7 +231,6 @@
}
// set default value
function setDefaultValue(dataSource: { pom?: DependencyType[]; jar?:
string[] }) {
- console.log('dataSource', dataSource);
dependencyRecords.value = dataSource.pom || [];
uploadJars.value = dataSource.jar || [];
dataSource.pom?.map((pomRecord: DependencyType) => {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
index 17272eb5c..9f48a077d 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
@@ -16,6 +16,7 @@
*/
import { dateToDuration } from '/@/utils/dateUtil';
import { BasicColumn } from '/@/components/Table';
+import { ExecutionModeEnum } from '/@/enums/flinkEnum';
/* app */
export const getAppColumns = (): BasicColumn[] => [
@@ -102,14 +103,18 @@ export const k8sRestExposedType = [
];
export const executionModes = [
- { label: 'remote (standalone)', value: 1, disabled: false },
- { label: 'yarn application', value: 4, disabled: false },
- { label: 'yarn session', value: 3, disabled: false },
- { label: 'kubernetes session', value: 5, disabled: false },
- { label: 'kubernetes application', value: 6, disabled: false },
+ { label: 'remote (standalone)', value: ExecutionModeEnum.REMOTE, disabled:
false },
+ { label: 'yarn application', value: ExecutionModeEnum.YARN_APPLICATION,
disabled: false },
+ { label: 'yarn session', value: ExecutionModeEnum.YARN_SESSION, disabled:
false },
+ { label: 'kubernetes session', value: ExecutionModeEnum.KUBERNETES_SESSION,
disabled: false },
+ {
+ label: 'kubernetes application',
+ value: ExecutionModeEnum.KUBERNETES_APPLICATION,
+ disabled: false,
+ },
{
label: 'yarn per-job (deprecated, please use yarn-application mode)',
- value: 2,
+ value: ExecutionModeEnum.YARN_PER_JOB,
disabled: false,
},
];
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEditStreamPark.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEditStreamPark.ts
index 6ed0790fa..0c363aebb 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEditStreamPark.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEditStreamPark.ts
@@ -21,7 +21,6 @@ import { executionModes } from '../data';
import { useCreateAndEditSchema } from './useCreateAndEditSchema';
import { renderSqlHistory } from './useFlinkRender';
import { Alert } from 'ant-design-vue';
-import { fetchGetVer } from '/@/api/flink/config';
import { decodeByBase64 } from '/@/utils/cipher';
import { fetchFlinkSql } from '/@/api/flink/app/flinkSql';
import { toPomString } from '../utils/Pom';
@@ -51,12 +50,13 @@ export const useEditStreamParkSchema = (
});
const [registerDifferentDrawer, { openDrawer: openDiffDrawer }] =
useDrawer();
- async function handleChangeSQL(v) {
- const res = await fetchGetVer({ id: v });
+ async function handleChangeSQL(v: string) {
+ const res = await fetchFlinkSql({ id: v });
flinkSql.value?.setContent(decodeByBase64(res.sql));
+ unref(dependencyRef)?.setDefaultValue(JSON.parse(res.dependency || '{}'));
}
-
- async function handleCompareOk(compareSQL) {
+ // start compare flinksql version
+ async function handleCompareOk(compareSQL: Array<string>) {
const res = await fetchFlinkSql({ id: compareSQL.join(',') });
const obj1 = res[0];
const obj2 = res[1];
@@ -129,6 +129,7 @@ export const useEditStreamParkSchema = (
ifShow: ({ values }) => {
return values.jobType == 2 && unref(flinkSqlHistory).length > 1;
},
+ required: true,
},
...getFlinkSqlSchema.value,
{
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
index 8abf64e45..2d214ff45 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
@@ -38,6 +38,7 @@ import { ref, unref } from 'vue';
import { handleConfTemplate } from '/@/api/flink/config';
import { decodeByBase64 } from '/@/utils/cipher';
import { useMessage } from '/@/hooks/web/useMessage';
+import { SelectValue } from 'ant-design-vue/lib/select';
/* render input dropdown component */
export const renderInputDropdown = (
@@ -349,6 +350,7 @@ export const renderIsSetConfig = (
);
};
+// render history version form item
export const renderSqlHistory = (
{ model, flinkSqlHistory },
{ handleChangeSQL, handleCompareOk }: { handleChangeSQL: Fn;
handleCompareOk: Fn },
@@ -356,11 +358,12 @@ export const renderSqlHistory = (
const { createConfirm } = useMessage();
const compareSQL = ref<string[]>([]);
- function handleSelectChange(value) {
- model.sqlId = value;
+ function handleSelectChange(value: SelectValue) {
+ model.flinkSqlHistory = value;
handleChangeSQL(value);
}
+ //version compact
function handleCompactSQL() {
createConfirm({
iconType: 'info',
@@ -370,9 +373,11 @@ export const renderSqlHistory = (
<span>Compare Flink SQL</span>
</div>
),
+ okText: 'Compare',
+ width: 600,
content: () => {
return (
- <Form class="!pt-20px">
+ <Form class="!pt-30px">
<Form.Item
label="Version"
label-col={{ lg: { span: 5 }, sm: { span: 7 } }}
@@ -391,15 +396,16 @@ export const renderSqlHistory = (
</Form>
);
},
- onOk: handleCompareOk.bind(null, compareSQL.value),
+ onOk: () => handleCompareOk(compareSQL.value),
});
}
- const renderSelectOptions = async (isCompareSelect = false) => {
- const isDisabled = (ver) => {
+ const renderSelectOptions = (isCompareSelect = false) => {
+ const isDisabled = (ver: Recordable) => {
if (!isCompareSelect) return false;
return compareSQL.value.length == 2 && compareSQL.value.findIndex((i) =>
i === ver.id) === -1;
};
+ console.log('flinkSqlHistory', flinkSqlHistory);
return (flinkSqlHistory || []).map((ver) => {
return (
<Select.Option key={ver.id} disabled={isDisabled(ver)}>
@@ -427,8 +433,8 @@ export const renderSqlHistory = (
return (
<div>
<Select
- onChange={(value) => handleSelectChange(value)}
- value={model.sqlId}
+ onChange={(value: SelectValue) => handleSelectChange(value)}
+ value={model.flinkSqlHistory}
style="width: calc(100% - 60px)"
>
{renderSelectOptions()}
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
index 5cb9a7a6c..b9d9fb81f 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
@@ -299,7 +299,7 @@
}
.alert-card-list {
.ant-list-empty-text {
- background-color: white;
+ background-color: @component-background;
}
}
</style>
![https://img.shields.io/github/stars/apache/incubator-streampark.svg?sanitize=true"](https://img.shields.io/github/stars/apache/incubator-streampark.svg?sanitize=true"){kind=link}
![https://img.shields.io/github/forks/apache/incubator-streampark.svg?sanitize=true"](https://img.shields.io/github/forks/apache/incubator-streampark.svg?sanitize=true"){kind=link}