From 1a2d7d16dc9f272f2b6e2f7841ba6e92745e4e21 Mon Sep 17 00:00:00 2001
From: wangqi <1942460489@qq.com>
Date: Tue, 5 Dec 2023 19:32:32 +0800
Subject: [PATCH 1/4] feature: add doris instance steps form

---
 .../scaleph/dao/mapper/master/security/SecUserRoleMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml
index 614cfd678..bad8979d4 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml
@@ -37,7 +37,7 @@
             sec_user t1
                 JOIN sec_user_role t2 ON t1.id = t2.user_id
         WHERE
-            t2.role_id = 1
+            t2.role_id = #{roleId}
         <if test="status != null">
             AND t1.`status` = #{status}
         </if>

From b428cd39d2b01ad86878c8c6c6e61d46bef91f85 Mon Sep 17 00:00:00 2001
From: wangqi <1942460489@qq.com>
Date: Tue, 5 Dec 2023 19:50:08 +0800
Subject: [PATCH 2/4] feature: optimize common jars

---
 .../entity/master/resource/ResourceJar.java   |  3 -
 .../master/resource/ResourceJarMapper.xml     |  3 +-
 .../resource/service/convert/JarConvert.java  |  3 +-
 .../resource/service/impl/JarServiceImpl.java |  8 +-
 .../resource/service/param/JarListParam.java  |  3 -
 .../service/param/JarUploadParam.java         |  8 +-
 .../src/locales/zh-CN/pages/resource.ts       |  1 -
 .../pages/Resource/Jar/components/JarForm.tsx |  9 +--
 .../src/pages/Resource/Jar/index.tsx          | 76 +++++++++----------
 .../src/services/resource/jar.service.ts      |  1 -
 .../src/services/resource/typings.d.ts        |  3 -
 .../mysql/init.d/scaleph-master-mysql.sql     |  1 -
 12 files changed, 44 insertions(+), 75 deletions(-)

diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java
index aa4a6e076..efb540509 100644
--- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java
@@ -36,9 +36,6 @@ public class ResourceJar extends BaseDO {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("`group`")
-    private String group;
-
     @TableField("file_name")
     private String fileName;
 
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/resource/ResourceJarMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/resource/ResourceJarMapper.xml
index 2364ba333..6e7d0f43b 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/resource/ResourceJarMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/resource/ResourceJarMapper.xml
@@ -26,7 +26,6 @@
         <result column="create_time" property="createTime" />
         <result column="editor" property="editor" />
         <result column="update_time" property="updateTime" />
-        <result column="group" property="group" />
         <result column="file_name" property="fileName" />
         <result column="path" property="path" />
         <result column="remark" property="remark" />
@@ -35,7 +34,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, creator, create_time, editor, update_time,
-        `group`, file_name, `path`, remark
+        file_name, `path`, remark
     </sql>
 
 </mapper>
diff --git a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/convert/JarConvert.java b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/convert/JarConvert.java
index f9926b77d..fe2133e56 100644
--- a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/convert/JarConvert.java
+++ b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/convert/JarConvert.java
@@ -35,8 +35,7 @@ public interface JarConvert extends BaseConvert<ResourceJar, JarDTO> {
 
     default JarListParam convert(ResourceListParam param) {
         JarListParam target = BeanUtil.copy(param, new JarListParam());
-        target.setGroup(param.getLabel());
-        target.setFileName(param.getName());
+        target.setFileName(param.getLabel());
         return target;
     }
 
diff --git a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/impl/JarServiceImpl.java b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/impl/JarServiceImpl.java
index 3d30430dc..675fa17c8 100644
--- a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/impl/JarServiceImpl.java
+++ b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/impl/JarServiceImpl.java
@@ -80,7 +80,6 @@ public Page<JarDTO> list(JarListParam param) throws IOException {
         final Page<ResourceJar> page = jarMapper.selectPage(
                 new Page<>(param.getCurrent(), param.getPageSize()),
                 Wrappers.lambdaQuery(ResourceJar.class)
-                        .eq(StringUtils.hasText(param.getGroup()), ResourceJar::getGroup, param.getGroup())
                         .like(StringUtils.hasText(param.getFileName()), ResourceJar::getFileName, param.getFileName()));
         Page<JarDTO> result =
                 new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
@@ -101,7 +100,7 @@ public void upload(JarUploadParam param, MultipartFile file) throws IOException
         String fileName = file.getOriginalFilename();
         Path path = null;
         try (InputStream inputStream = file.getInputStream()) {
-            path = fileSystemService.upload(inputStream, getJarPath(param.getGroup(), fileName));
+            path = fileSystemService.upload(inputStream, getJarPath(fileName));
         }
         ResourceJar record = new ResourceJar();
         BeanUtils.copyProperties(param, record);
@@ -134,11 +133,10 @@ public void delete(Long id) throws IOException {
         jarMapper.deleteById(id);
     }
 
-    private String getJarPath(String group, String fileName) {
-        return String.format("%s/%s/%s", getJarRootPath(), group, fileName);
+    private String getJarPath(String fileName) {
+        return String.format("%s/%s", getJarRootPath(), fileName);
     }
 
-
     private String getJarRootPath() {
         return "jar";
     }
diff --git a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarListParam.java b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarListParam.java
index 4ae6c32d8..27d553528 100644
--- a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarListParam.java
+++ b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarListParam.java
@@ -27,9 +27,6 @@
 @EqualsAndHashCode(callSuper = true)
 public class JarListParam extends PaginationParam {
 
-    @Schema(description = "jar group")
-    private String group;
-
     @Schema(description = "文件名称。支持模糊匹配")
     private String fileName;
 
diff --git a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarUploadParam.java b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarUploadParam.java
index 127599d71..11ec99ef2 100644
--- a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarUploadParam.java
+++ b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/JarUploadParam.java
@@ -21,15 +21,9 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 public class JarUploadParam {
-
-    @NotBlank
-    @Schema(description = "jar group")
-    private String group;
-
+    
     @Schema(description = "备注")
     private String remark;
 }
diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/resource.ts b/scaleph-ui-react/src/locales/zh-CN/pages/resource.ts
index 9ba8a5ad3..b1972973f 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/resource.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/resource.ts
@@ -21,7 +21,6 @@ export default {
     'YARN 上传 core-site.xml 和 hdfs-site.xml, ' +
     'Kubernetes 上传 kubeconfig 文件',
   'pages.resource.jar': '公共 Jar',
-  'pages.resource.jar.group': 'Group',
   'pages.resource.jar.file': 'Jar',
   'pages.resource.jar.fileName': '文件名',
   'pages.resource.jar.path': '存储路径',
diff --git a/scaleph-ui-react/src/pages/Resource/Jar/components/JarForm.tsx b/scaleph-ui-react/src/pages/Resource/Jar/components/JarForm.tsx
index c14986c5b..266ae05ab 100644
--- a/scaleph-ui-react/src/pages/Resource/Jar/components/JarForm.tsx
+++ b/scaleph-ui-react/src/pages/Resource/Jar/components/JarForm.tsx
@@ -1,7 +1,7 @@
 import {useIntl} from 'umi';
 import {useState} from 'react';
 import {Form, message, Modal, UploadFile, UploadProps} from 'antd';
-import {ProForm, ProFormDigit, ProFormText, ProFormUploadButton} from '@ant-design/pro-components';
+import {ProForm, ProFormDigit, ProFormTextArea, ProFormUploadButton} from '@ant-design/pro-components';
 import {ModalFormProps} from '@/app.d';
 import {ResourceJarService} from '@/services/resource/jar.service';
 import {Jar, JarUploadParam} from '@/services/resource/typings';
@@ -72,11 +72,6 @@ const JarForm: React.FC<ModalFormProps<Jar>> = ({data, visible, onVisibleChange,
     >
       <ProForm form={form} layout={"horizontal"} submitter={false} labelCol={{span: 6}} wrapperCol={{span: 16}}>
         <ProFormDigit name="id" hidden/>
-        <ProFormText
-          name="group"
-          label={intl.formatMessage({id: 'pages.resource.jar.group'})}
-          rules={[{required: true}, {max: 128}]}
-        />
         <ProFormUploadButton
           name={"file"}
           label={intl.formatMessage({id: 'pages.resource.file'})}
@@ -85,7 +80,7 @@ const JarForm: React.FC<ModalFormProps<Jar>> = ({data, visible, onVisibleChange,
           fieldProps={props}
           rules={[{required: true}]}
         />
-        <ProFormText
+        <ProFormTextArea
           name="remark"
           label={intl.formatMessage({id: 'app.common.data.remark'})}
           rules={[{max: 200}]}
diff --git a/scaleph-ui-react/src/pages/Resource/Jar/index.tsx b/scaleph-ui-react/src/pages/Resource/Jar/index.tsx
index c99c61a56..5241fdac6 100644
--- a/scaleph-ui-react/src/pages/Resource/Jar/index.tsx
+++ b/scaleph-ui-react/src/pages/Resource/Jar/index.tsx
@@ -1,11 +1,11 @@
-import { useAccess, useIntl } from 'umi';
-import { useRef, useState } from 'react';
-import { Button, message, Modal, Space, Tooltip } from 'antd';
-import { DeleteOutlined, DownloadOutlined } from '@ant-design/icons';
-import { ActionType, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
-import { PRIVILEGE_CODE } from '@/constant';
-import { ResourceJarService } from '@/services/resource/jar.service';
-import { Jar } from '@/services/resource/typings';
+import {useAccess, useIntl} from 'umi';
+import {useRef, useState} from 'react';
+import {Button, message, Modal, Space, Tooltip} from 'antd';
+import {DeleteOutlined, DownloadOutlined} from '@ant-design/icons';
+import {ActionType, ProColumns, ProFormInstance, ProTable} from '@ant-design/pro-components';
+import {PRIVILEGE_CODE} from '@/constant';
+import {ResourceJarService} from '@/services/resource/jar.service';
+import {Jar} from '@/services/resource/typings';
 import JarForm from './components/JarForm';
 
 const JarResource: React.FC = () => {
@@ -17,42 +17,38 @@ const JarResource: React.FC = () => {
   const [jarFormData, setJarData] = useState<{
     visiable: boolean;
     data: Jar;
-  }>({ visiable: false, data: {} });
+  }>({visiable: false, data: {}});
 
   const tableColumns: ProColumns<Jar>[] = [
     {
-      title: intl.formatMessage({ id: 'pages.resource.jar.group' }),
-      dataIndex: 'group',
-    },
-    {
-      title: intl.formatMessage({ id: 'pages.resource.fileName' }),
+      title: intl.formatMessage({id: 'pages.resource.fileName'}),
       dataIndex: 'fileName',
       width: 280,
     },
     {
-      title: intl.formatMessage({ id: 'pages.resource.path' }),
+      title: intl.formatMessage({id: 'pages.resource.path'}),
       dataIndex: 'path',
       hideInSearch: true,
     },
     {
-      title: intl.formatMessage({ id: 'app.common.data.remark' }),
+      title: intl.formatMessage({id: 'app.common.data.remark'}),
       dataIndex: 'remark',
       hideInSearch: true,
     },
     {
-      title: intl.formatMessage({ id: 'app.common.data.createTime' }),
+      title: intl.formatMessage({id: 'app.common.data.createTime'}),
       dataIndex: 'createTime',
       hideInSearch: true,
       width: 180,
     },
     {
-      title: intl.formatMessage({ id: 'app.common.data.updateTime' }),
+      title: intl.formatMessage({id: 'app.common.data.updateTime'}),
       dataIndex: 'updateTime',
       hideInSearch: true,
       width: 180,
     },
     {
-      title: intl.formatMessage({ id: 'app.common.operate.label' }),
+      title: intl.formatMessage({id: 'app.common.operate.label'}),
       dataIndex: 'actions',
       align: 'center',
       width: 120,
@@ -62,32 +58,32 @@ const JarResource: React.FC = () => {
         <>
           <Space>
             {access.canAccess(PRIVILEGE_CODE.datadevResourceDownload) && (
-              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.download.label' })}>
+              <Tooltip title={intl.formatMessage({id: 'app.common.operate.download.label'})}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<DownloadOutlined></DownloadOutlined>}
+                  icon={<DownloadOutlined/>}
                   onClick={() => ResourceJarService.download(record)}
                 />
               </Tooltip>
             )}
             {access.canAccess(PRIVILEGE_CODE.datadevResourceDelete) && (
-              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.delete.label' })}>
+              <Tooltip title={intl.formatMessage({id: 'app.common.operate.delete.label'})}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<DeleteOutlined />}
+                  icon={<DeleteOutlined/>}
                   onClick={() => {
                     Modal.confirm({
-                      title: intl.formatMessage({ id: 'app.common.operate.delete.confirm.title' }),
+                      title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
                       content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
-                      okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
-                      okButtonProps: { danger: true },
-                      cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
+                      okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
+                      okButtonProps: {danger: true},
+                      cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
                       onOk() {
                         ResourceJarService.deleteOne(record).then((d) => {
                           if (d.success) {
-                            message.success(intl.formatMessage({ id: 'app.common.operate.delete.success' }));
+                            message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
                             actionRef.current?.reload();
                           }
                         });
@@ -108,7 +104,7 @@ const JarResource: React.FC = () => {
       <ProTable<Jar>
         search={{
           labelWidth: 'auto',
-          span: { xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4 },
+          span: {xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4},
         }}
         rowKey="id"
         actionRef={actionRef}
@@ -124,9 +120,9 @@ const JarResource: React.FC = () => {
               <Button
                 key="new"
                 type="primary"
-                onClick={() => setJarData({ visiable: true, data: {} })}
+                onClick={() => setJarData({visiable: true, data: {}})}
               >
-                {intl.formatMessage({ id: 'app.common.operate.upload.label' })}
+                {intl.formatMessage({id: 'app.common.operate.upload.label'})}
               </Button>
             ),
             access.canAccess(PRIVILEGE_CODE.datadevResourceDelete) && (
@@ -136,15 +132,15 @@ const JarResource: React.FC = () => {
                 disabled={selectedRows.length < 1}
                 onClick={() => {
                   Modal.confirm({
-                    title: intl.formatMessage({ id: 'app.common.operate.delete.confirm.title' }),
+                    title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
                     content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
-                    okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
-                    okButtonProps: { danger: true },
-                    cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
+                    okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
+                    okButtonProps: {danger: true},
+                    cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
                     onOk() {
                       ResourceJarService.deleteBatch(selectedRows).then((d) => {
                         if (d.success) {
-                          message.success(intl.formatMessage({ id: 'app.common.operate.delete.success' }));
+                          message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
                           actionRef.current?.reload();
                         }
                       });
@@ -152,12 +148,12 @@ const JarResource: React.FC = () => {
                   });
                 }}
               >
-                {intl.formatMessage({ id: 'app.common.operate.delete.label' })}
+                {intl.formatMessage({id: 'app.common.operate.delete.label'})}
               </Button>
             ),
           ],
         }}
-        pagination={{ showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10 }}
+        pagination={{showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10}}
         rowSelection={{
           fixed: true,
           onChange(selectedRowKeys, selectedRows, info) {
@@ -171,10 +167,10 @@ const JarResource: React.FC = () => {
         <JarForm
           visible={jarFormData.visiable}
           onCancel={() => {
-            setJarData({ visiable: false, data: {} });
+            setJarData({visiable: false, data: {}});
           }}
           onVisibleChange={(visiable) => {
-            setJarData({ visiable: visiable, data: {} });
+            setJarData({visiable: visiable, data: {}});
             actionRef.current?.reload();
           }}
           data={jarFormData.data}
diff --git a/scaleph-ui-react/src/services/resource/jar.service.ts b/scaleph-ui-react/src/services/resource/jar.service.ts
index 666505a39..b7e2b9dcf 100644
--- a/scaleph-ui-react/src/services/resource/jar.service.ts
+++ b/scaleph-ui-react/src/services/resource/jar.service.ts
@@ -29,7 +29,6 @@ export const ResourceJarService = {
 
   upload: async (uploadParam: JarUploadParam) => {
     const formData = new FormData();
-    formData.append('group', uploadParam.group);
     formData.append('file', uploadParam.file);
     if (uploadParam.remark) {
       formData.append('remark', uploadParam.remark);
diff --git a/scaleph-ui-react/src/services/resource/typings.d.ts b/scaleph-ui-react/src/services/resource/typings.d.ts
index 0a23ac0fb..9679e08ab 100644
--- a/scaleph-ui-react/src/services/resource/typings.d.ts
+++ b/scaleph-ui-react/src/services/resource/typings.d.ts
@@ -8,7 +8,6 @@ export type ResourceListParam = QueryParam & {
 
 export type Jar = {
   id?: number;
-  group?: string;
   fileName?: string;
   path?: string;
   remark?: string;
@@ -17,12 +16,10 @@ export type Jar = {
 }
 
 export type JarListParam = QueryParam & {
-  group?: string;
   fileName?: string;
 }
 
 export type JarUploadParam = QueryParam & {
-  group?: string;
   file: File;
   remark?: String;
 }
diff --git a/tools/docker/mysql/init.d/scaleph-master-mysql.sql b/tools/docker/mysql/init.d/scaleph-master-mysql.sql
index 3d737db09..ab47023ae 100644
--- a/tools/docker/mysql/init.d/scaleph-master-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-master-mysql.sql
@@ -75,7 +75,6 @@ DROP TABLE IF EXISTS resource_jar;
 CREATE TABLE resource_jar
 (
     id          bigint       NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-    `group`     varchar(255) NOT NULL COMMENT 'jar group',
     file_name   varchar(255) NOT NULL COMMENT '文件名称',
     path        varchar(255) NOT NULL COMMENT '存储路径',
     remark      varchar(255)      DEFAULT NULL COMMENT '备注',

From 0e1108924b9280dec25933ca4171f350296f7c57 Mon Sep 17 00:00:00 2001
From: wangqi <1942460489@qq.com>
Date: Tue, 5 Dec 2023 19:58:57 +0800
Subject: [PATCH 3/4] feature: optimize flink kubernetes template

---
 .../src/locales/zh-CN/pages/project.ts        | 10 +++----
 .../Template/DeploymentTemplateForm.tsx       | 28 +++++++++----------
 .../Detail/Advanced/AdvancedBasic.tsx         |  2 +-
 .../Kubernetes/Template/Detail/index.tsx      |  2 +-
 .../Workspace/Kubernetes/Template/index.tsx   |  8 +++---
 5 files changed, 24 insertions(+), 26 deletions(-)

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 a6c40469c..321e270c0 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -818,11 +818,11 @@ export default {
   // Sql
   'pages.project.di.step.sql.query': 'SQL',
 
-  'pages.project.flink.kubernetes.deployment.template': 'Deployment Template',
-  'pages.project.flink.kubernetes.deployment.template.name': '名称',
-  'pages.project.flink.kubernetes.deployment.template.deploymentKind': '部署模式',
-  'pages.project.flink.kubernetes.deployment.template.namespace': 'Namespace',
-  'pages.project.flink.kubernetes.deployment.template.define': '模板定义',
+  'pages.project.flink.kubernetes.template': 'Template',
+  'pages.project.flink.kubernetes.template.name': '名称',
+  'pages.project.flink.kubernetes.template.deploymentKind': '部署模式',
+  'pages.project.flink.kubernetes.template.namespace': 'Namespace',
+  'pages.project.flink.kubernetes.template.detail': '模板详情',
   'pages.project.flink.kubernetes.template.step.advanced.configOptions': 'ConfigOption',
   'pages.project.flink.kubernetes.template.step.advanced.configOptions.key': 'Config',
   'pages.project.flink.kubernetes.template.step.advanced.configOptions.value': 'Value',
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/DeploymentTemplateForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/DeploymentTemplateForm.tsx
index 42719af7a..b4a73f8e6 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/DeploymentTemplateForm.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/DeploymentTemplateForm.tsx
@@ -1,21 +1,19 @@
 import {useIntl} from "umi";
 import React from "react";
 import {Form, message, Modal} from "antd";
-import {ProForm, ProFormDigit, ProFormRadio, ProFormSelect, ProFormText} from "@ant-design/pro-components";
+import {ProForm, ProFormDigit, ProFormRadio, ProFormText, ProFormTextArea} from "@ant-design/pro-components";
 import {ModalFormProps} from '@/app.d';
 import {WsFlinkKubernetesTemplate} from "@/services/project/typings";
-import {
-  WsFlinkKubernetesTemplateService
-} from "@/services/project/WsFlinkKubernetesTemplateService";
+import {WsFlinkKubernetesTemplateService} from "@/services/project/WsFlinkKubernetesTemplateService";
 import {DICT_TYPE, WORKSPACE_CONF} from "@/constant";
 import {DictDataService} from "@/services/admin/dictData.service";
 
 const DeploymentTemplateForm: React.FC<ModalFormProps<WsFlinkKubernetesTemplate>> = ({
-                                                                                                 data,
-                                                                                                 visible,
-                                                                                                 onVisibleChange,
-                                                                                                 onCancel
-                                                                                               }) => {
+                                                                                       data,
+                                                                                       visible,
+                                                                                       onVisibleChange,
+                                                                                       onCancel
+                                                                                     }) => {
   const intl = useIntl();
   const [form] = Form.useForm();
   const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
@@ -26,9 +24,9 @@ const DeploymentTemplateForm: React.FC<ModalFormProps<WsFlinkKubernetesTemplate>
       title={
         data.id
           ? intl.formatMessage({id: 'app.common.operate.edit.label'}) +
-          intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template'})
+          intl.formatMessage({id: 'pages.project.flink.kubernetes.template'})
           : intl.formatMessage({id: 'app.common.operate.new.label'}) +
-          intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template'})
+          intl.formatMessage({id: 'pages.project.flink.kubernetes.template'})
       }
       width={580}
       destroyOnClose={true}
@@ -72,22 +70,22 @@ const DeploymentTemplateForm: React.FC<ModalFormProps<WsFlinkKubernetesTemplate>
         <ProFormDigit name={"id"} hidden/>
         <ProFormText
           name={"name"}
-          label={intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.name'})}
+          label={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.name'})}
           rules={[{required: true}]}
         />
         <ProFormRadio.Group
           name={"deploymentKind"}
-          label={intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.deploymentKind'})}
+          label={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.deploymentKind'})}
           rules={[{required: true}]}
           disabled={data?.id}
           request={() => DictDataService.listDictDataByType2(DICT_TYPE.deploymentKind)}
         />
         <ProFormText
           name={"namespace"}
-          label={intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.namespace'})}
+          label={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.namespace'})}
           rules={[{required: true}]}
         />
-        <ProFormText
+        <ProFormTextArea
           name={"remark"}
           label={intl.formatMessage({id: 'app.common.data.remark'})}
         />
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/Advanced/AdvancedBasic.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/Advanced/AdvancedBasic.tsx
index 36dc79780..cabab286d 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/Advanced/AdvancedBasic.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/Advanced/AdvancedBasic.tsx
@@ -26,7 +26,7 @@ const AdvancedBasic: React.FC = () => {
         name="image"
         label={'image'}
         colProps={{span: 10, offset: 1}}
-        initialValue={"flink:1.16"}
+        initialValue={"flink:1.18"}
       />
       <ProFormSelect
         name="imagePullPolicy"
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx
index 0c1e6dac9..9852a96fb 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx
@@ -30,7 +30,7 @@ const FlinkKubernetesDeploymentTemplateDetailWeb: React.FC = (props: any) => {
     {label: 'YAML', key: 'yaml', children: <DeploymentTemplateYAML data={data}/>},
   ]
   return (
-    <PageContainer>
+    <PageContainer title={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.detail'})}>
       <Tabs items={items}/>
       <FooterToolbar>
         <Button onClick={onCancel}>{intl.formatMessage({id: 'app.common.operate.cancel.label'})}</Button>
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx
index 50146b105..080f6c14f 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx
@@ -25,11 +25,11 @@ const FlinkKubernetesDeploymentTemplateWeb: React.FC = () => {
 
   const tableColumns: ProColumns<WsFlinkKubernetesTemplate>[] = [
     {
-      title: intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.name'}),
+      title: intl.formatMessage({id: 'pages.project.flink.kubernetes.template.name'}),
       dataIndex: 'name'
     },
     {
-      title: intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.deploymentKind'}),
+      title: intl.formatMessage({id: 'pages.project.flink.kubernetes.template.deploymentKind'}),
       dataIndex: 'deploymentKind',
       width: 150,
       render: (dom, entity) => {
@@ -46,7 +46,7 @@ const FlinkKubernetesDeploymentTemplateWeb: React.FC = () => {
       }
     },
     {
-      title: intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.namespace'}),
+      title: intl.formatMessage({id: 'pages.project.flink.kubernetes.template.namespace'}),
       dataIndex: 'namespace',
       hideInSearch: true,
       width: 150
@@ -90,7 +90,7 @@ const FlinkKubernetesDeploymentTemplateWeb: React.FC = () => {
             </Tooltip>
           )}
           {access.canAccess(PRIVILEGE_CODE.datadevJobEdit) && (
-            <Tooltip title={intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.define'})}>
+            <Tooltip title={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.detail'})}>
               <Button
                 shape="default"
                 type="link"

From e7275f04622e610e1e0346012b71410db29c6f6e Mon Sep 17 00:00:00 2001
From: wangqi <1942460489@qq.com>
Date: Tue, 5 Dec 2023 21:35:05 +0800
Subject: [PATCH 4/4] feature: optimize flink kubernetes template

---
 scaleph-ui-react/config/routes.ts             |  7 ++
 .../src/locales/zh-CN/pages/project.ts        |  1 +
 .../template/flinkKubernetesTemplateDetail.ts | 55 ++++++++++++
 .../template/flinkKubernetesTemplateSteps.ts  | 55 ++++++++++++
 .../Template/Steps/BaseStepForm.tsx           | 37 ++++++++
 .../Kubernetes/Template/Steps/index.tsx       | 86 +++++++++++++++++++
 .../Workspace/Kubernetes/Template/index.tsx   |  2 +-
 .../mysql/init.d/scaleph-security-mysql.sql   |  4 +
 8 files changed, 246 insertions(+), 1 deletion(-)
 create mode 100644 scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateDetail.ts
 create mode 100644 scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateSteps.ts
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/BaseStepForm.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/index.tsx

diff --git a/scaleph-ui-react/config/routes.ts b/scaleph-ui-react/config/routes.ts
index 1fcc0a931..a68cb2902 100644
--- a/scaleph-ui-react/config/routes.ts
+++ b/scaleph-ui-react/config/routes.ts
@@ -150,6 +150,13 @@ export default [
             pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
             access: 'normalRouteFilter'
           },
+          {
+            path: '/workspace/flink/kubernetes/template/steps',
+            exact: true,
+            component: './Project/Workspace/Kubernetes/Template/Steps',
+            pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
+            access: 'normalRouteFilter'
+          },
           {
             path: '/workspace/flink/kubernetes/template/detail',
             exact: true,
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 321e270c0..d06611bde 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -823,6 +823,7 @@ export default {
   'pages.project.flink.kubernetes.template.deploymentKind': '部署模式',
   'pages.project.flink.kubernetes.template.namespace': 'Namespace',
   'pages.project.flink.kubernetes.template.detail': '模板详情',
+  'pages.project.flink.kubernetes.template.step.base': '基础信息',
   'pages.project.flink.kubernetes.template.step.advanced.configOptions': 'ConfigOption',
   'pages.project.flink.kubernetes.template.step.advanced.configOptions.key': 'Config',
   'pages.project.flink.kubernetes.template.step.advanced.configOptions.value': 'Value',
diff --git a/scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateDetail.ts b/scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateDetail.ts
new file mode 100644
index 000000000..552ea1cd0
--- /dev/null
+++ b/scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateDetail.ts
@@ -0,0 +1,55 @@
+import {WsFlinkKubernetesTemplate} from "@/services/project/typings";
+import { Reducer, Effect } from "umi";
+import {WsFlinkKubernetesTemplateService} from "@/services/project/WsFlinkKubernetesTemplateService";
+import YAML from "yaml";
+
+export interface StateType {
+  template: WsFlinkKubernetesTemplate,
+  templateYaml: string
+  templateYamlWithDefault: string
+}
+
+export interface ModelType {
+  namespace: string;
+
+  state: StateType;
+
+  effects: {
+    queryTemplate: Effect;
+  };
+
+  reducers: {
+    updateTemplate: Reducer<StateType>;
+  };
+}
+
+const model: ModelType = {
+  namespace: "flinkKubernetesTemplateDetail",
+
+  state: {
+    template: null,
+    templateYaml: null,
+    templateYamlWithDefault: null
+  },
+
+  effects: {
+    *editTemplate({ payload }, { call, put }) {
+      const { data } = yield call(WsFlinkKubernetesTemplateService.asYaml, payload);
+      const response = yield call(WsFlinkKubernetesTemplateService.asYamlWithDefault, payload);
+      yield put({ type: 'updateTemplate', payload: {template: payload, templateYaml: YAML.stringify(data), templateYamlWithDefault: YAML.stringify(response.data)} });
+    },
+  },
+
+  reducers: {
+    updateTemplate(state, { payload }) {
+      return {
+        ...state,
+        template: payload.template,
+        templateYaml: payload.templateYaml,
+        templateYamlWithDefault: payload.templateYamlWithDefault,
+      };
+    },
+  },
+};
+
+export default model;
diff --git a/scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateSteps.ts b/scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateSteps.ts
new file mode 100644
index 000000000..0e17e8ebd
--- /dev/null
+++ b/scaleph-ui-react/src/models/project/workspace/kubernetes/template/flinkKubernetesTemplateSteps.ts
@@ -0,0 +1,55 @@
+import {WsFlinkKubernetesTemplate} from "@/services/project/typings";
+import { Reducer, Effect } from "umi";
+import {WsFlinkKubernetesTemplateService} from "@/services/project/WsFlinkKubernetesTemplateService";
+import YAML from "yaml";
+
+export interface StateType {
+  template: WsFlinkKubernetesTemplate,
+  templateYaml: string
+  templateYamlWithDefault: string
+}
+
+export interface ModelType {
+  namespace: string;
+
+  state: StateType;
+
+  effects: {
+    queryTemplate: Effect;
+  };
+
+  reducers: {
+    updateTemplate: Reducer<StateType>;
+  };
+}
+
+const model: ModelType = {
+  namespace: "flinkKubernetesTemplateSteps",
+
+  state: {
+    template: null,
+    templateYaml: null,
+    templateYamlWithDefault: null
+  },
+
+  effects: {
+    *editTemplate({ payload }, { call, put }) {
+      const { data } = yield call(WsFlinkKubernetesTemplateService.asYaml, payload);
+      const response = yield call(WsFlinkKubernetesTemplateService.asYamlWithDefault, payload);
+      yield put({ type: 'updateTemplate', payload: {template: payload, templateYaml: YAML.stringify(data), templateYamlWithDefault: YAML.stringify(response.data)} });
+    },
+  },
+
+  reducers: {
+    updateTemplate(state, { payload }) {
+      return {
+        ...state,
+        template: payload.template,
+        templateYaml: payload.templateYaml,
+        templateYamlWithDefault: payload.templateYamlWithDefault,
+      };
+    },
+  },
+};
+
+export default model;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/BaseStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/BaseStepForm.tsx
new file mode 100644
index 000000000..6832b384f
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/BaseStepForm.tsx
@@ -0,0 +1,37 @@
+import React from "react";
+import {ProCard, ProFormDigit, ProFormSelect, ProFormText, ProFormTextArea} from "@ant-design/pro-components";
+import {useIntl} from "umi";
+import {DICT_TYPE} from "@/constant";
+import {DictDataService} from "@/services/admin/dictData.service";
+
+const FlinkKubernetesTemplateBase: React.FC = () => {
+  const intl = useIntl();
+
+  return (
+    <ProCard>
+      <ProFormDigit name={"id"} hidden/>
+      <ProFormText
+        name={"name"}
+        label={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.name'})}
+        rules={[{required: true}]}
+      />
+      <ProFormSelect
+        name={"deploymentKind"}
+        label={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.deploymentKind'})}
+        rules={[{required: true}]}
+        request={() => DictDataService.listDictDataByType2(DICT_TYPE.deploymentKind)}
+      />
+      <ProFormText
+        name={"namespace"}
+        label={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.namespace'})}
+        rules={[{required: true}]}
+      />
+      <ProFormTextArea
+        name={"remark"}
+        label={intl.formatMessage({id: 'app.common.data.remark'})}
+      />
+    </ProCard>
+  );
+}
+
+export default FlinkKubernetesTemplateBase;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/index.tsx
new file mode 100644
index 000000000..1efb5c334
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Steps/index.tsx
@@ -0,0 +1,86 @@
+import {connect, history, useIntl} from "umi";
+import React, {useRef} from "react";
+import {ProCard, ProFormInstance, StepsForm} from "@ant-design/pro-components";
+import {WORKSPACE_CONF} from "@/constant";
+import {WsDorisTemplate, WsFlinkKubernetesTemplate} from "@/services/project/typings";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import FlinkKubernetesTemplateBase from "@/pages/Project/Workspace/Kubernetes/Template/Steps/BaseStepForm";
+
+const FlinkKubernetesTemplateSteps: React.FC = (props: any) => {
+  const intl = useIntl();
+  const formRef = useRef<ProFormInstance>();
+  const localProjectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  const onBaseStepFinish = (values: Record<string, any>) => {
+    const template: WsFlinkKubernetesTemplate = {
+      projectId: localProjectId,
+      deploymentKind: values.deploymentKind,
+      name: values.name,
+      namespace: values.namespace,
+      remark: values.remark,
+    }
+    editDorisTemplate(template)
+    return Promise.resolve(true)
+  }
+
+  const onComponentStepFinish = (values: Record<string, any>) => {
+    try {
+      const template: WsDorisTemplate = WsDorisTemplateService.formatData(props.dorisTemplateSteps.template, values)
+      editDorisTemplate(template)
+    } catch (unused) {
+    }
+    return Promise.resolve(true)
+  }
+
+  const editDorisTemplate = (template: WsDorisTemplate) => {
+    props.dispatch({
+      type: 'flinkKubernetesTemplateSteps/editTemplate',
+      payload: template
+    })
+  }
+
+  const onAllFinish = (values: Record<string, any>) => {
+    return WsDorisTemplateService.add(props.dorisTemplateSteps.template).then((response) => {
+      if (response.success) {
+        history.back()
+      }
+    })
+  }
+
+  return (
+    <ProCard className={'step-form-submitter'}>
+      <StepsForm
+        formRef={formRef}
+        formProps={{
+          grid: true,
+          rowProps: {gutter: [16, 8]}
+        }}
+        // onFinish={onAllFinish}
+      >
+        <StepsForm.StepForm
+          name="base"
+          title={intl.formatMessage({id: 'pages.project.flink.kubernetes.template.step.base'})}
+          style={{width: 1000}}
+          onFinish={onBaseStepFinish}>
+          <FlinkKubernetesTemplateBase/>
+        </StepsForm.StepForm>
+        {/*<StepsForm.StepForm*/}
+        {/*  name="component"*/}
+        {/*  title={intl.formatMessage({id: 'pages.project.doris.template.steps.component'})}*/}
+        {/*  style={{width: 1000}}*/}
+        {/*  onFinish={onComponentStepFinish}>*/}
+        {/*  <DorisTemplateComponent/>*/}
+        {/*</StepsForm.StepForm>*/}
+        {/*<StepsForm.StepForm*/}
+        {/*  name="yaml"*/}
+        {/*  title={intl.formatMessage({id: 'pages.project.doris.template.steps.yaml'})}*/}
+        {/*  style={{width: 1000}}>*/}
+        {/*  <DorisTemplateYAML/>*/}
+        {/*</StepsForm.StepForm>*/}
+      </StepsForm>
+    </ProCard>
+  )
+}
+
+const mapModelToProps = ({flinkKubernetesTemplateSteps}: any) => ({flinkKubernetesTemplateSteps})
+export default connect(mapModelToProps)(FlinkKubernetesTemplateSteps);
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx
index 080f6c14f..efd4d9623 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/index.tsx
@@ -154,7 +154,7 @@ const FlinkKubernetesDeploymentTemplateWeb: React.FC = () => {
               key="new"
               type="primary"
               onClick={() => {
-                setDeploymentTemplateFormData({visiable: true, data: {}});
+                history.push("/workspace/flink/kubernetes/template/steps")
               }}
             >
               {intl.formatMessage({id: 'app.common.operate.new.label'})}
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index aaba0a229..e07a9afef 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -571,6 +571,10 @@ INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`,
                                `creator`, `editor`)
 VALUES (71, '2', 64, '', '/workspace/doris/instance/detail', NULL, NULL, NULL,
         './Project/Workspace/Doris/Instance/Detail', NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (72, '2', 21, NULL, '/workspace/flink/kubernetes/template/steps', NULL, NULL, NULL,
+        './Project/Workspace/Kubernetes/Template/Steps', NULL, 'sys', 'sys');
 
 drop table if exists sec_resource_web_role;
 create table sec_resource_web_role