You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2022/08/03 08:44:13 UTC

[dolphinscheduler] branch dev updated: [fix-11233][ui] Remove custom template switch button in chunjun component module (#11234)

This is an automated email from the ASF dual-hosted git repository.

liudongkai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 2adfc52e55 [fix-11233][ui] Remove custom template switch button in chunjun component module (#11234)
2adfc52e55 is described below

commit 2adfc52e5553cc12ae655fda34cade3de9fc05d8
Author: 秋天 <ji...@cmss.chinamobile.com>
AuthorDate: Wed Aug 3 16:44:01 2022 +0800

    [fix-11233][ui] Remove custom template switch button in chunjun component module (#11234)
    
    - delete obsolete switch button
    
    This closes #11233
---
 dolphinscheduler-ui/src/locales/en_US/project.ts   |  3 +--
 dolphinscheduler-ui/src/locales/zh_CN/project.ts   |  3 +--
 .../task/components/node/fields/use-chunjun.ts     | 27 +++-------------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts
index 895876ea32..918b49e592 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 58bf4bf974..fd4ed8e624 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 f98933ea92..617a8e5145 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',