From c8eb1218230e14030da3b5cd9a314bcaf21a5782 Mon Sep 17 00:00:00 2001 From: wangqi Date: Fri, 10 May 2024 15:30:06 +0800 Subject: [PATCH] refactor: update seatunnel 2.3.5 feishu connectors --- .../fake/source/FakeProperties.java | 18 +- .../fake/source/FakeSourcePlugin.java | 2 +- .../src/locales/zh-CN/pages/project.ts | 5 +- .../Dag/components/node/steps/constant.tsx | 3 - .../node/steps/sink/sink-email-step.tsx | 4 +- .../node/steps/sink/sink-feishu-step.tsx | 36 +- .../node/steps/source/source-fake-step.tsx | 784 +++++++++--------- 7 files changed, 419 insertions(+), 433 deletions(-) diff --git a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeProperties.java b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeProperties.java index 078080341..ce6f1da11 100644 --- a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeProperties.java +++ b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeProperties.java @@ -52,6 +52,15 @@ public enum FakeProperties { .addValidator(Validators.POSITIVE_INTEGER_VALIDATOR) .validateAndBuild(); + public static final PropertyDescriptor ROWS = new PropertyDescriptor.Builder() + .name("rows") + .description( + "The row list of fake data output per degree of parallelism") + .type(PropertyType.OBJECT) + .parser(Parsers.JSON_PARSER) + .addValidator(Validators.NON_BLANK_VALIDATOR) + .validateAndBuild(); + public static final PropertyDescriptor SPLIT_NUM = new PropertyDescriptor.Builder() .name("split.num") .description("the number of splits generated by the enumerator for each degree of parallelism") @@ -106,15 +115,6 @@ public enum FakeProperties { .addValidator(Validators.POSITIVE_INTEGER_VALIDATOR) .validateAndBuild(); - public static final PropertyDescriptor ROWS = new PropertyDescriptor.Builder() - .name("rows") - .description( - "The row list of fake data output per degree of parallelism") - .type(PropertyType.OBJECT) - .parser(Parsers.JSON_PARSER) - .addValidator(Validators.NON_BLANK_VALIDATOR) - .validateAndBuild(); - public static final PropertyDescriptor STRING_FAKE_MODE = new PropertyDescriptor.Builder() .name("string.fake.mode") .description("The fake mode of generating string data") diff --git a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeSourcePlugin.java b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeSourcePlugin.java index 847854c03..088885f5b 100644 --- a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeSourcePlugin.java +++ b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/src/main/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeSourcePlugin.java @@ -43,13 +43,13 @@ public FakeSourcePlugin() { props.add(TABLES_CONFIGS); props.add(SCHEMA); props.add(ROW_NUM); + props.add(ROWS); props.add(SPLIT_NUM); props.add(SPLIT_READ_INTERVAL); props.add(MAP_SIZE); props.add(ARRAY_SIZE); props.add(BYTES_SIZE); props.add(STRING_SIZE); - props.add(ROWS); props.add(STRING_FAKE_MODE); props.add(STRING_TEMPLATE); diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts index 1a024c2f5..c5a20d297 100644 --- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts +++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts @@ -319,9 +319,8 @@ export default { // feishu 'pages.project.di.step.feishu.url': '飞书机器人URL', - 'pages.project.di.step.feishu.headers': 'Header', - 'pages.project.di.step.feishu.header': 'header', - 'pages.project.di.step.feishu.value': 'value', + 'pages.project.di.step.feishu.headers': 'Headers', + 'pages.project.di.step.feishu.headers.tooltip': 'Http 请求 Headers', // dingtalk 'pages.project.di.step.dingtalk.url': '钉钉机器人URL', diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/constant.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/constant.tsx index 99e8b4f0f..a23c7758b 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/constant.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/constant.tsx @@ -239,10 +239,7 @@ export const WeChatParams = { export const FeishuParams = { url: 'url', - headerArray: 'headerArray', headers: 'headers', - header: 'header', - headerValue: 'headerValue' }; export const DingTalkParams = { diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-email-step.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-email-step.tsx index e98819370..062fedc5a 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-email-step.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-email-step.tsx @@ -83,9 +83,7 @@ const SinkEmailStepForm: React.FC> = ({data, visible, onVis diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-feishu-step.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-feishu-step.tsx index 7a31af439..04a5847c6 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-feishu-step.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-feishu-step.tsx @@ -1,11 +1,14 @@ import React, {useEffect} from 'react'; import {Form} from 'antd'; -import {DrawerForm, ProFormGroup, ProFormList, ProFormText} from '@ant-design/pro-components'; +import {InfoCircleOutlined} from "@ant-design/icons"; +import {DrawerForm, ProFormGroup, ProFormText} from '@ant-design/pro-components'; import {getIntl, getLocale} from "@umijs/max"; import {Node, XFlow} from '@antv/xflow'; import {ModalFormProps} from '@/typings'; import {FeishuParams, STEP_ATTR_TYPE} from '../constant'; import {StepSchemaService} from "../helper"; +import CommonConfigItem + from "@/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/common/config/commonConfig"; const SinkFeishuStepForm: React.FC> = ({data, visible, onVisibleChange, onOK}) => { const intl = getIntl(getLocale()); @@ -32,7 +35,7 @@ const SinkFeishuStepForm: React.FC> = ({data, visible, onVi }} onFinish={(values) => { if (onOK) { - StepSchemaService.formatHeader(values); + StepSchemaService.formatCommonConfig(values, FeishuParams.headers, FeishuParams.headers); onOK(values) return Promise.resolve(true) } @@ -50,28 +53,17 @@ const SinkFeishuStepForm: React.FC> = ({data, visible, onVi label={intl.formatMessage({id: 'pages.project.di.step.feishu.url'})} rules={[{required: true}]} /> - , }} + collapsible={true} + defaultCollapsed={true} > - - - - - + + ); diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/source/source-fake-step.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/source/source-fake-step.tsx index 5a6e77869..c387605bd 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/source/source-fake-step.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/source/source-fake-step.tsx @@ -2,13 +2,13 @@ import React, {useEffect} from 'react'; import {Form} from 'antd'; import {InfoCircleOutlined} from '@ant-design/icons'; import { - DrawerForm, - ProFormDigit, - ProFormGroup, - ProFormList, - ProFormSelect, - ProFormText, - ProFormTextArea, + DrawerForm, + ProFormDigit, + ProFormGroup, + ProFormList, + ProFormSelect, + ProFormText, + ProFormTextArea, } from '@ant-design/pro-components'; import {getIntl, getLocale} from "@umijs/max"; import {Node, XFlow} from '@antv/xflow'; @@ -19,395 +19,395 @@ import {DictDataService} from "@/services/admin/dictData.service"; import {DICT_TYPE} from "@/constants/dictType"; const SourceFakeStepForm: React.FC> = ({data, visible, onVisibleChange, onOK}) => { - const intl = getIntl(getLocale()); - const [form] = Form.useForm(); + const intl = getIntl(getLocale()); + const [form] = Form.useForm(); - useEffect(() => { - form.setFieldValue(STEP_ATTR_TYPE.stepTitle, data.data.label); - }, []); + useEffect(() => { + form.setFieldValue(STEP_ATTR_TYPE.stepTitle, data.data.label); + }, []); - return ( - - { - if (onOK) { - StepSchemaService.formatSchema(values); - onOK(values) - return Promise.resolve(true) - } - return Promise.resolve(false) - }} - > - - , - }} - /> - - - , - }} - colProps={{span: 8}} - initialValue={1} - fieldProps={{ - step: 1, - min: 1, - }} - /> - , - }} - colProps={{span: 8}} - initialValue={1} - fieldProps={{ - step: 1, - min: 1, - }} - /> - - - - - { - return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) - }} - /> - - { - return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) - }} - /> - - - - { - return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) - }} - /> - - - - { - return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) - }} - /> - - - - { - return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) - }} - /> - - - - { - return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) - }} - /> - - - - { - return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) - }} - /> - - - + return ( + + { + if (onOK) { + StepSchemaService.formatSchema(values); + onOK(values) + return Promise.resolve(true) + } + return Promise.resolve(false) + }} + > + + , + }} + /> + + + , + }} + colProps={{span: 8}} + initialValue={1} + fieldProps={{ + step: 1, + min: 1, + }} + /> + , + }} + colProps={{span: 8}} + initialValue={1} + fieldProps={{ + step: 1, + min: 1, + }} + /> + + + + + { + return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) + }} + /> + + { + return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) + }} + /> + + + + { + return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) + }} + /> + + + + { + return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) + }} + /> + + + + { + return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) + }} + /> + + + + { + return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) + }} + /> + + + + { + return DictDataService.listDictDataByType2(DICT_TYPE.seatunnelFakeMode) + }} + /> + + + - - - - - - + + + + + + - , - }} - > - - - - - - - - - - ); + , + }} + > + + + + + + + + + + ); }; export default SourceFakeStepForm;