Commit 850c4e061e91463f4f574f890eeb394b9b6a5905
Merge branch 'fix/front/10-25/2024' into 'main_dev'
perf: 调用统计显示折线图为图示了 See merge request yunteng/thingskit-front!1516
Showing
5 changed files
with
47 additions
and
37 deletions
| @@ -46,6 +46,12 @@ | @@ -46,6 +46,12 @@ | ||
| 46 | 46 | ||
| 47 | const chartRef = ref<HTMLDivElement | null>(null); | 47 | const chartRef = ref<HTMLDivElement | null>(null); |
| 48 | 48 | ||
| 49 | + const watchClientWidth = () => { | ||
| 50 | + return `width:${document.body.clientWidth - 280}px`; | ||
| 51 | + }; | ||
| 52 | + | ||
| 53 | + const resizeStatus = ref(false); | ||
| 54 | + | ||
| 49 | const { setOptions, resize } = useECharts(chartRef as Ref<HTMLDivElement>); | 55 | const { setOptions, resize } = useECharts(chartRef as Ref<HTMLDivElement>); |
| 50 | 56 | ||
| 51 | const getOptions = (): EChartsOption => { | 57 | const getOptions = (): EChartsOption => { |
| @@ -99,6 +105,7 @@ | @@ -99,6 +105,7 @@ | ||
| 99 | window.addEventListener('resize', () => { | 105 | window.addEventListener('resize', () => { |
| 100 | resize(); | 106 | resize(); |
| 101 | setOptions(getOptions()); | 107 | setOptions(getOptions()); |
| 108 | + resizeStatus.value = true; | ||
| 102 | }); | 109 | }); |
| 103 | }); | 110 | }); |
| 104 | 111 | ||
| @@ -106,6 +113,7 @@ | @@ -106,6 +113,7 @@ | ||
| 106 | const startTs = Date.now() - e.target.value; | 113 | const startTs = Date.now() - e.target.value; |
| 107 | const endTs = Date.now(); | 114 | const endTs = Date.now(); |
| 108 | emits('emitTimeRange', e.target.value, startTs, endTs); | 115 | emits('emitTimeRange', e.target.value, startTs, endTs); |
| 116 | + watchClientWidth(); | ||
| 109 | }; | 117 | }; |
| 110 | </script> | 118 | </script> |
| 111 | <template> | 119 | <template> |
| @@ -120,9 +128,11 @@ | @@ -120,9 +128,11 @@ | ||
| 120 | </template> | 128 | </template> |
| 121 | </a-radio-group> | 129 | </a-radio-group> |
| 122 | </template> | 130 | </template> |
| 131 | + <!-- 不能使用100%设为宽,width=100%,实际是100px--> | ||
| 123 | <div | 132 | <div |
| 124 | v-show="(chartsData?.series as SeriesOption[])?.length" | 133 | v-show="(chartsData?.series as SeriesOption[])?.length" |
| 125 | ref="chartRef" | 134 | ref="chartRef" |
| 135 | + :style="!resizeStatus ? watchClientWidth() : `null`" | ||
| 126 | class="w-full h-80" | 136 | class="w-full h-80" |
| 127 | ></div> | 137 | ></div> |
| 128 | <div | 138 | <div |
| @@ -46,7 +46,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -46,7 +46,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 46 | component: 'Input', | 46 | component: 'Input', |
| 47 | componentProps: { | 47 | componentProps: { |
| 48 | maxLength: 32, | 48 | maxLength: 32, |
| 49 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.name')}`, | 49 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.name')}`, |
| 50 | }, | 50 | }, |
| 51 | }, | 51 | }, |
| 52 | { | 52 | { |
| @@ -58,7 +58,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -58,7 +58,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 58 | component: 'Input', | 58 | component: 'Input', |
| 59 | componentProps: { | 59 | componentProps: { |
| 60 | maxLength: 255, | 60 | maxLength: 255, |
| 61 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 61 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 62 | 'rule.dataflow.index.restEndpointUrlPattern' | 62 | 'rule.dataflow.index.restEndpointUrlPattern' |
| 63 | )}`, | 63 | )}`, |
| 64 | }, | 64 | }, |
| @@ -70,7 +70,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -70,7 +70,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 70 | colProps: { span: 12 }, | 70 | colProps: { span: 12 }, |
| 71 | defaultValue: ApiFormPartialConfig.requestMethod, | 71 | defaultValue: ApiFormPartialConfig.requestMethod, |
| 72 | componentProps: { | 72 | componentProps: { |
| 73 | - placeholder: `${t('rule.dataflow.index.pleaseSelect')} ${t( | 73 | + placeholder: `${t('rule.dataflow.index.pleaseSelect')}${t( |
| 74 | 'rule.dataflow.index.requestMethod' | 74 | 'rule.dataflow.index.requestMethod' |
| 75 | )}`, | 75 | )}`, |
| 76 | options: ApiFormPartialConfig.getRequestMethod(), | 76 | options: ApiFormPartialConfig.getRequestMethod(), |
| @@ -106,7 +106,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -106,7 +106,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 106 | component: 'InputNumber', | 106 | component: 'InputNumber', |
| 107 | defaultValue: ApiFormPartialConfig.proxyPort, | 107 | defaultValue: ApiFormPartialConfig.proxyPort, |
| 108 | componentProps: { | 108 | componentProps: { |
| 109 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.proxyPort')}`, | 109 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.proxyPort')}`, |
| 110 | maxLength: 255, | 110 | maxLength: 255, |
| 111 | min: 1, | 111 | min: 1, |
| 112 | max: 65535, | 112 | max: 65535, |
| @@ -123,7 +123,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -123,7 +123,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 123 | component: 'Input', | 123 | component: 'Input', |
| 124 | componentProps: { | 124 | componentProps: { |
| 125 | maxLength: 255, | 125 | maxLength: 255, |
| 126 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.proxyUser')}`, | 126 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.proxyUser')}`, |
| 127 | }, | 127 | }, |
| 128 | ifShow: ({ values }) => { | 128 | ifShow: ({ values }) => { |
| 129 | return !!values.enableProxy; | 129 | return !!values.enableProxy; |
| @@ -137,7 +137,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -137,7 +137,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 137 | component: 'InputPassword', | 137 | component: 'InputPassword', |
| 138 | componentProps: { | 138 | componentProps: { |
| 139 | maxLength: 255, | 139 | maxLength: 255, |
| 140 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 140 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 141 | 'rule.dataflow.index.proxyPassword' | 141 | 'rule.dataflow.index.proxyPassword' |
| 142 | )}`, | 142 | )}`, |
| 143 | }, | 143 | }, |
| @@ -248,7 +248,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -248,7 +248,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 248 | colProps: { span: 12 }, | 248 | colProps: { span: 12 }, |
| 249 | defaultValue: ApiFormPartialConfig.type, | 249 | defaultValue: ApiFormPartialConfig.type, |
| 250 | componentProps: { | 250 | componentProps: { |
| 251 | - placeholder: `${t('rule.dataflow.index.pleaseSelect')} ${t( | 251 | + placeholder: `${t('rule.dataflow.index.pleaseSelect')}${t( |
| 252 | 'rule.dataflow.index.credentialsType' | 252 | 'rule.dataflow.index.credentialsType' |
| 253 | )}`, | 253 | )}`, |
| 254 | options: ApiFormPartialConfig.getType(), | 254 | options: ApiFormPartialConfig.getType(), |
| @@ -270,7 +270,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -270,7 +270,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 270 | required: true, | 270 | required: true, |
| 271 | componentProps: { | 271 | componentProps: { |
| 272 | maxLength: 255, | 272 | maxLength: 255, |
| 273 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.username')}`, | 273 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.username')}`, |
| 274 | }, | 274 | }, |
| 275 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), | 275 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), |
| 276 | }, | 276 | }, |
| @@ -282,7 +282,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -282,7 +282,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 282 | required: true, | 282 | required: true, |
| 283 | componentProps: { | 283 | componentProps: { |
| 284 | maxLength: 255, | 284 | maxLength: 255, |
| 285 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.password')}`, | 285 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.password')}`, |
| 286 | }, | 286 | }, |
| 287 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), | 287 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), |
| 288 | }, | 288 | }, |
| @@ -293,7 +293,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -293,7 +293,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 293 | component: 'InputPassword', | 293 | component: 'InputPassword', |
| 294 | componentProps: { | 294 | componentProps: { |
| 295 | maxLength: 255, | 295 | maxLength: 255, |
| 296 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.password')}`, | 296 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.password')}`, |
| 297 | }, | 297 | }, |
| 298 | ifShow: ({ values }) => isPem(Reflect.get(values, 'type')), | 298 | ifShow: ({ values }) => isPem(Reflect.get(values, 'type')), |
| 299 | }, | 299 | }, |
| @@ -306,7 +306,7 @@ export const modeApiForm: FormSchema[] = [ | @@ -306,7 +306,7 @@ export const modeApiForm: FormSchema[] = [ | ||
| 306 | componentProps: { | 306 | componentProps: { |
| 307 | maxLength: 255, | 307 | maxLength: 255, |
| 308 | rows: 4, | 308 | rows: 4, |
| 309 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.remark')}`, | 309 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.remark')}`, |
| 310 | }, | 310 | }, |
| 311 | }, | 311 | }, |
| 312 | ]; | 312 | ]; |
| @@ -49,7 +49,7 @@ export const modelKafkaForm: FormSchema[] = [ | @@ -49,7 +49,7 @@ export const modelKafkaForm: FormSchema[] = [ | ||
| 49 | component: 'Input', | 49 | component: 'Input', |
| 50 | componentProps: { | 50 | componentProps: { |
| 51 | maxLength: 32, | 51 | maxLength: 32, |
| 52 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.name')}`, | 52 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.name')}`, |
| 53 | }, | 53 | }, |
| 54 | }, | 54 | }, |
| 55 | { | 55 | { |
| @@ -61,7 +61,7 @@ export const modelKafkaForm: FormSchema[] = [ | @@ -61,7 +61,7 @@ export const modelKafkaForm: FormSchema[] = [ | ||
| 61 | defaultValue: KafkaFormPartialConfig.topicPattern, | 61 | defaultValue: KafkaFormPartialConfig.topicPattern, |
| 62 | componentProps: { | 62 | componentProps: { |
| 63 | maxLength: 255, | 63 | maxLength: 255, |
| 64 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 64 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 65 | 'rule.dataflow.index.topicPattern' | 65 | 'rule.dataflow.index.topicPattern' |
| 66 | )}`, | 66 | )}`, |
| 67 | }, | 67 | }, |
| @@ -125,7 +125,7 @@ export const modelKafkaForm: FormSchema[] = [ | @@ -125,7 +125,7 @@ export const modelKafkaForm: FormSchema[] = [ | ||
| 125 | colProps: { span: 12 }, | 125 | colProps: { span: 12 }, |
| 126 | defaultValue: KafkaFormPartialConfig.acks, | 126 | defaultValue: KafkaFormPartialConfig.acks, |
| 127 | componentProps: { | 127 | componentProps: { |
| 128 | - placeholder: `${t('rule.dataflow.index.pleaseSelect')} ${t('rule.dataflow.index.acks')}`, | 128 | + placeholder: `${t('rule.dataflow.index.pleaseSelect')}${t('rule.dataflow.index.acks')}`, |
| 129 | options: KafkaFormPartialConfig.getAcks(), | 129 | options: KafkaFormPartialConfig.getAcks(), |
| 130 | }, | 130 | }, |
| 131 | }, | 131 | }, |
| @@ -176,7 +176,7 @@ export const modelKafkaForm: FormSchema[] = [ | @@ -176,7 +176,7 @@ export const modelKafkaForm: FormSchema[] = [ | ||
| 176 | colProps: { span: 12 }, | 176 | colProps: { span: 12 }, |
| 177 | defaultValue: KafkaFormPartialConfig.kafkaHeadersCharset, | 177 | defaultValue: KafkaFormPartialConfig.kafkaHeadersCharset, |
| 178 | componentProps: { | 178 | componentProps: { |
| 179 | - placeholder: `${t('rule.dataflow.index.pleaseSelect')} ${t( | 179 | + placeholder: `${t('rule.dataflow.index.pleaseSelect')}${t( |
| 180 | 'rule.dataflow.index.characterSet' | 180 | 'rule.dataflow.index.characterSet' |
| 181 | )}`, | 181 | )}`, |
| 182 | options: KafkaFormPartialConfig.getkafkaHeadersCharset(), | 182 | options: KafkaFormPartialConfig.getkafkaHeadersCharset(), |
| @@ -193,7 +193,7 @@ export const modelKafkaForm: FormSchema[] = [ | @@ -193,7 +193,7 @@ export const modelKafkaForm: FormSchema[] = [ | ||
| 193 | componentProps: { | 193 | componentProps: { |
| 194 | maxLength: 255, | 194 | maxLength: 255, |
| 195 | rows: 4, | 195 | rows: 4, |
| 196 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.remark')}`, | 196 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.remark')}`, |
| 197 | }, | 197 | }, |
| 198 | }, | 198 | }, |
| 199 | ]; | 199 | ]; |
| @@ -34,7 +34,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -34,7 +34,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 34 | required: true, | 34 | required: true, |
| 35 | componentProps: { | 35 | componentProps: { |
| 36 | maxLength: 32, | 36 | maxLength: 32, |
| 37 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.name')}`, | 37 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.name')}`, |
| 38 | }, | 38 | }, |
| 39 | }, | 39 | }, |
| 40 | { | 40 | { |
| @@ -46,7 +46,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -46,7 +46,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 46 | defaultValue: MqttFormPartialConfig.topicPattern, | 46 | defaultValue: MqttFormPartialConfig.topicPattern, |
| 47 | componentProps: { | 47 | componentProps: { |
| 48 | maxLength: 255, | 48 | maxLength: 255, |
| 49 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 49 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 50 | 'rule.dataflow.index.topicPattern' | 50 | 'rule.dataflow.index.topicPattern' |
| 51 | )}`, | 51 | )}`, |
| 52 | }, | 52 | }, |
| @@ -59,7 +59,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -59,7 +59,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 59 | required: true, | 59 | required: true, |
| 60 | componentProps: { | 60 | componentProps: { |
| 61 | maxLength: 255, | 61 | maxLength: 255, |
| 62 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.host')}`, | 62 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.host')}`, |
| 63 | }, | 63 | }, |
| 64 | }, | 64 | }, |
| 65 | { | 65 | { |
| @@ -71,7 +71,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -71,7 +71,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 71 | required: true, | 71 | required: true, |
| 72 | componentProps: { | 72 | componentProps: { |
| 73 | maxLength: 255, | 73 | maxLength: 255, |
| 74 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.port')}`, | 74 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.port')}`, |
| 75 | }, | 75 | }, |
| 76 | }, | 76 | }, |
| 77 | { | 77 | { |
| @@ -83,7 +83,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -83,7 +83,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 83 | required: true, | 83 | required: true, |
| 84 | componentProps: { | 84 | componentProps: { |
| 85 | maxLength: 255, | 85 | maxLength: 255, |
| 86 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 86 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 87 | 'rule.dataflow.index.connectTimeoutSec' | 87 | 'rule.dataflow.index.connectTimeoutSec' |
| 88 | )}`, | 88 | )}`, |
| 89 | }, | 89 | }, |
| @@ -109,7 +109,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -109,7 +109,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 109 | } | 109 | } |
| 110 | }, | 110 | }, |
| 111 | maxLength: 255, | 111 | maxLength: 255, |
| 112 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.clientId')}`, | 112 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.clientId')}`, |
| 113 | }; | 113 | }; |
| 114 | }, | 114 | }, |
| 115 | }, | 115 | }, |
| @@ -147,7 +147,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -147,7 +147,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 147 | componentProps: ({ formActionType }) => { | 147 | componentProps: ({ formActionType }) => { |
| 148 | const { setFieldsValue } = formActionType; | 148 | const { setFieldsValue } = formActionType; |
| 149 | return { | 149 | return { |
| 150 | - placeholder: `${t('rule.dataflow.index.pleaseSelect')} ${t( | 150 | + placeholder: `${t('rule.dataflow.index.pleaseSelect')}${t( |
| 151 | 'rule.dataflow.index.credentialsType' | 151 | 'rule.dataflow.index.credentialsType' |
| 152 | )}`, | 152 | )}`, |
| 153 | options: MqttFormPartialConfig.getType(), | 153 | options: MqttFormPartialConfig.getType(), |
| @@ -178,7 +178,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -178,7 +178,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 178 | required: true, | 178 | required: true, |
| 179 | componentProps: { | 179 | componentProps: { |
| 180 | maxLength: 255, | 180 | maxLength: 255, |
| 181 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.username')}`, | 181 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.username')}`, |
| 182 | }, | 182 | }, |
| 183 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), | 183 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), |
| 184 | }, | 184 | }, |
| @@ -189,7 +189,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -189,7 +189,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 189 | component: 'InputPassword', | 189 | component: 'InputPassword', |
| 190 | componentProps: { | 190 | componentProps: { |
| 191 | maxLength: 255, | 191 | maxLength: 255, |
| 192 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.password')}`, | 192 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.password')}`, |
| 193 | }, | 193 | }, |
| 194 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), | 194 | ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')), |
| 195 | }, | 195 | }, |
| @@ -200,7 +200,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -200,7 +200,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 200 | component: 'InputPassword', | 200 | component: 'InputPassword', |
| 201 | componentProps: { | 201 | componentProps: { |
| 202 | maxLength: 255, | 202 | maxLength: 255, |
| 203 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.password')}`, | 203 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.password')}`, |
| 204 | }, | 204 | }, |
| 205 | ifShow: ({ values }) => isPem(Reflect.get(values, 'type')), | 205 | ifShow: ({ values }) => isPem(Reflect.get(values, 'type')), |
| 206 | }, | 206 | }, |
| @@ -212,7 +212,7 @@ export const modeMqttForm: FormSchema[] = [ | @@ -212,7 +212,7 @@ export const modeMqttForm: FormSchema[] = [ | ||
| 212 | componentProps: { | 212 | componentProps: { |
| 213 | maxLength: 255, | 213 | maxLength: 255, |
| 214 | rows: 4, | 214 | rows: 4, |
| 215 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.remark')}`, | 215 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.remark')}`, |
| 216 | }, | 216 | }, |
| 217 | }, | 217 | }, |
| 218 | ]; | 218 | ]; |
| @@ -38,7 +38,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -38,7 +38,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 38 | component: 'Input', | 38 | component: 'Input', |
| 39 | componentProps: { | 39 | componentProps: { |
| 40 | maxLength: 32, | 40 | maxLength: 32, |
| 41 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.name')}`, | 41 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.name')}`, |
| 42 | }, | 42 | }, |
| 43 | }, | 43 | }, |
| 44 | { | 44 | { |
| @@ -49,7 +49,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -49,7 +49,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 49 | defaultValue: '', | 49 | defaultValue: '', |
| 50 | componentProps: { | 50 | componentProps: { |
| 51 | maxLength: 255, | 51 | maxLength: 255, |
| 52 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 52 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 53 | 'rule.dataflow.index.exchangeNamePattern' | 53 | 'rule.dataflow.index.exchangeNamePattern' |
| 54 | )}`, | 54 | )}`, |
| 55 | }, | 55 | }, |
| @@ -62,7 +62,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -62,7 +62,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 62 | component: 'Input', | 62 | component: 'Input', |
| 63 | componentProps: { | 63 | componentProps: { |
| 64 | maxLength: 255, | 64 | maxLength: 255, |
| 65 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 65 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 66 | 'rule.dataflow.index.routingKeyPattern' | 66 | 'rule.dataflow.index.routingKeyPattern' |
| 67 | )}`, | 67 | )}`, |
| 68 | }, | 68 | }, |
| @@ -74,7 +74,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -74,7 +74,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 74 | colProps: { span: 12 }, | 74 | colProps: { span: 12 }, |
| 75 | defaultValue: null, | 75 | defaultValue: null, |
| 76 | componentProps: { | 76 | componentProps: { |
| 77 | - placeholder: `${t('rule.dataflow.index.pleaseSelect')} ${t( | 77 | + placeholder: `${t('rule.dataflow.index.pleaseSelect')}${t( |
| 78 | 'rule.dataflow.index.routingKeyPattern' | 78 | 'rule.dataflow.index.routingKeyPattern' |
| 79 | )}`, | 79 | )}`, |
| 80 | options: RabbitMqFormPartialConfig.getMessageProperties(), | 80 | options: RabbitMqFormPartialConfig.getMessageProperties(), |
| @@ -101,7 +101,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -101,7 +101,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 101 | required: true, | 101 | required: true, |
| 102 | componentProps: { | 102 | componentProps: { |
| 103 | maxLength: 255, | 103 | maxLength: 255, |
| 104 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.port')}`, | 104 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.port')}`, |
| 105 | }, | 105 | }, |
| 106 | }, | 106 | }, |
| 107 | { | 107 | { |
| @@ -123,7 +123,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -123,7 +123,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 123 | defaultValue: RabbitMqFormPartialConfig.username, | 123 | defaultValue: RabbitMqFormPartialConfig.username, |
| 124 | componentProps: { | 124 | componentProps: { |
| 125 | maxLength: 255, | 125 | maxLength: 255, |
| 126 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.username')}`, | 126 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.username')}`, |
| 127 | }, | 127 | }, |
| 128 | }, | 128 | }, |
| 129 | { | 129 | { |
| @@ -134,7 +134,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -134,7 +134,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 134 | defaultValue: RabbitMqFormPartialConfig.password, | 134 | defaultValue: RabbitMqFormPartialConfig.password, |
| 135 | componentProps: { | 135 | componentProps: { |
| 136 | maxLength: 255, | 136 | maxLength: 255, |
| 137 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.password')}`, | 137 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.password')}`, |
| 138 | }, | 138 | }, |
| 139 | }, | 139 | }, |
| 140 | { | 140 | { |
| @@ -153,7 +153,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -153,7 +153,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 153 | defaultValue: RabbitMqFormPartialConfig.connectionTimeout, | 153 | defaultValue: RabbitMqFormPartialConfig.connectionTimeout, |
| 154 | componentProps: { | 154 | componentProps: { |
| 155 | maxLength: 255, | 155 | maxLength: 255, |
| 156 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 156 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 157 | 'rule.dataflow.index.connectionTimeout' | 157 | 'rule.dataflow.index.connectionTimeout' |
| 158 | )}`, | 158 | )}`, |
| 159 | }, | 159 | }, |
| @@ -166,7 +166,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -166,7 +166,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 166 | defaultValue: RabbitMqFormPartialConfig.handshakeTimeout, | 166 | defaultValue: RabbitMqFormPartialConfig.handshakeTimeout, |
| 167 | componentProps: { | 167 | componentProps: { |
| 168 | maxLength: 255, | 168 | maxLength: 255, |
| 169 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t( | 169 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t( |
| 170 | 'rule.dataflow.index.handshakeTimeout' | 170 | 'rule.dataflow.index.handshakeTimeout' |
| 171 | )}`, | 171 | )}`, |
| 172 | }, | 172 | }, |
| @@ -186,7 +186,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | @@ -186,7 +186,7 @@ export const modeRabbitMqForm: FormSchema[] = [ | ||
| 186 | componentProps: { | 186 | componentProps: { |
| 187 | maxLength: 255, | 187 | maxLength: 255, |
| 188 | rows: 4, | 188 | rows: 4, |
| 189 | - placeholder: `${t('rule.dataflow.index.pleaseEnter')} ${t('rule.dataflow.index.remark')}`, | 189 | + placeholder: `${t('rule.dataflow.index.pleaseEnter')}${t('rule.dataflow.index.remark')}`, |
| 190 | }, | 190 | }, |
| 191 | }, | 191 | }, |
| 192 | ]; | 192 | ]; |