diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts index 895876ea3213df56d07832b833b9ae76e56bc110..918b49e592fe7fddec73091bc1792497a869a7ee 100644 --- a/dolphinscheduler-ui/src/locales/en_US/project.ts +++ b/dolphinscheduler-ui/src/locales/en_US/project.ts @@ -527,8 +527,7 @@ export default { datax_job_runtime_memory_xms: 'Low Limit Value', datax_job_runtime_memory_xmx: 'High Limit Value', datax_job_runtime_memory_unit: 'G', - chunjun_custom_template: 'Custom Template', - chunjun_json_template: 'JSON', + chunjun_json_template: 'JSON script', current_hour: 'CurrentHour', last_1_hour: 'Last1Hour', last_2_hour: 'Last2Hours', diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts b/dolphinscheduler-ui/src/locales/zh_CN/project.ts index 58bf4bf9747e2a4361dddea40bc9c95f5ed75454..fd4ed8e624ef47c07d04acfcbfcf4968b68e7b60 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts @@ -520,8 +520,7 @@ export default { datax_job_runtime_memory_xms: '最小内存', datax_job_runtime_memory_xmx: '最大内存', datax_job_runtime_memory_unit: 'G', - chunjun_custom_template: '自定义模板', - chunjun_json_template: 'JSON', + chunjun_json_template: 'JSON 脚本', current_hour: '当前小时', last_1_hour: '前1小时', last_2_hour: '前2小时', diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-chunjun.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-chunjun.ts index f98933ea9289b209cf60f0864612f16a35951708..617a8e51450599ad9573db25dc8915bb15090fe8 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-chunjun.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-chunjun.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ref, onMounted, watch } from 'vue' +import { ref, onMounted } from 'vue' import { useI18n } from 'vue-i18n' import type { IJsonItem } from '../types' import { useChunjunDeployMode } from './' @@ -26,36 +26,15 @@ export function useChunjun(model: { [field: string]: any }): IJsonItem[] { const customParameterSpan = ref(0) const initConstants = () => { - if (model.customConfig) { - jsonEditorSpan.value = 24 - customParameterSpan.value = 24 - } else { - jsonEditorSpan.value = 0 - customParameterSpan.value = 0 - } + jsonEditorSpan.value = 24 + customParameterSpan.value = 24 } onMounted(() => { initConstants() }) - watch( - () => model.customConfig, - () => { - initConstants() - } - ) - return [ - { - type: 'switch', - field: 'customConfig', - value: true, - name: t('project.node.chunjun_custom_template'), - props: { - disabled: true - } - }, { type: 'editor', field: 'json',