Browse Source

[Improve][UI Next] Add a few instructions on how to call a procedure in the form of the procedure task. (#8566)

* improve the form of procedure

* improve the form of the procedure task
3.0.0/version-upgrade
calvin 3 years ago committed by GitHub
parent
commit
ab459a511f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      dolphinscheduler-ui-next/README.md
  2. 2
      dolphinscheduler-ui-next/src/locales/modules/en_US.ts
  3. 2
      dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
  4. 5
      dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-procedure.ts
  5. 3
      dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts
  6. 50
      dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log.module.scss

1
dolphinscheduler-ui-next/README.md

@ -26,7 +26,6 @@ You can learn how to install the corresponding version from their official websi
pnpm install pnpm install
``` ```
#### Start Development Project #### Start Development Project
To do this you need to change the `VITE_APP_DEV_WEB_URL` parameter variable in `.env.development` in the project root directory. To do this you need to change the `VITE_APP_DEV_WEB_URL` parameter variable in `.env.development` in the project root directory.

2
dolphinscheduler-ui-next/src/locales/modules/en_US.ts

@ -713,6 +713,8 @@ const project = {
sql_empty_tips: 'The sql can not be empty.', sql_empty_tips: 'The sql can not be empty.',
procedure_method: 'SQL Statement', procedure_method: 'SQL Statement',
procedure_method_tips: 'Please enter the procedure script', procedure_method_tips: 'Please enter the procedure script',
procedure_method_snippet:
'--Please enter the procedure script \n\n--call procedure:call <procedure-name>[(<arg1>,<arg2>, ...)]\n\n--call function:?= call <procedure-name>[(<arg1>,<arg2>, ...)]',
start: 'Start', start: 'Start',
edit: 'Edit', edit: 'Edit',
copy: 'Copy', copy: 'Copy',

2
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts

@ -705,6 +705,8 @@ const project = {
sql_empty_tips: '语句不能为空', sql_empty_tips: '语句不能为空',
procedure_method: 'SQL语句', procedure_method: 'SQL语句',
procedure_method_tips: '请输入存储脚本', procedure_method_tips: '请输入存储脚本',
procedure_method_snippet:
'--请输入存储脚本 \n\n--调用存储过程: call <procedure-name>[(<arg1>,<arg2>, ...)] \n\n--调用存储函数:?= call <procedure-name>[(<arg1>,<arg2>, ...)]',
start: '运行', start: '运行',
edit: '编辑', edit: '编辑',
copy: '复制节点', copy: '复制节点',

5
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-procedure.ts

@ -25,6 +25,11 @@ export function useProcedure(model: { [field: string]: any }): IJsonItem[] {
type: 'editor', type: 'editor',
field: 'method', field: 'method',
name: t('project.node.procedure_method'), name: t('project.node.procedure_method'),
props: {
language: 'sql',
placeholder: t('project.node.procedure_method_tips'),
defaultValue: model.method? model.method : t('project.node.procedure_method_snippet')
},
validate: { validate: {
trigger: ['input', 'trigger'], trigger: ['input', 'trigger'],
required: true, required: true,

3
dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts

@ -19,6 +19,7 @@ import { reactive } from 'vue'
import * as Fields from '../fields/index' import * as Fields from '../fields/index'
import type { IJsonItem, INodeData } from '../types' import type { IJsonItem, INodeData } from '../types'
import { ITaskData } from '../types' import { ITaskData } from '../types'
import { useI18n } from 'vue-i18n'
export function useProcedure({ export function useProcedure({
projectCode, projectCode,
@ -31,6 +32,8 @@ export function useProcedure({
readonly?: boolean readonly?: boolean
data?: ITaskData data?: ITaskData
}) { }) {
const { t } = useI18n()
const model = reactive({ const model = reactive({
name: '', name: '',
taskType: 'PROCEDURE', taskType: 'PROCEDURE',

50
dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log.module.scss

@ -21,7 +21,7 @@
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0,0,0,.4); background: rgba(0, 0, 0, 0.4);
z-index: 10; z-index: 10;
.log-box { .log-box {
width: 660px; width: 660px;
@ -29,7 +29,7 @@
background: #fff; background: #fff;
border-radius: 3px; border-radius: 3px;
position: absolute; position: absolute;
left:50%; left: 50%;
top: 50%; top: 50%;
margin-left: -340px; margin-left: -340px;
margin-top: -250px; margin-top: -250px;
@ -54,19 +54,19 @@
} }
.content { .content {
height: calc(100% - 100px); height: calc(100% - 100px);
background: #002A35; background: #002a35;
padding:6px 2px; padding: 6px 2px;
.content-log-box { .content-log-box {
width: 100%; width: 100%;
height: 100%; height: 100%;
word-break:break-all; word-break: break-all;
textarea { textarea {
background: none; background: none;
color: #9CABAF; color: #9cabaf;
border: 0; border: 0;
font-family: 'Microsoft Yahei,Arial,Hiragino Sans GB,tahoma,SimSun,sans-serif'; font-family: 'Microsoft Yahei,Arial,Hiragino Sans GB,tahoma,SimSun,sans-serif';
font-weight: bold; font-weight: bold;
resize:none; resize: none;
line-height: 1.6; line-height: 1.6;
padding: 0px; padding: 0px;
} }
@ -83,15 +83,35 @@
} }
} }
} }
@-webkit-keyframes rotateloading{from{-webkit-transform: rotate(0deg)} @-webkit-keyframes rotateloading {
to{-webkit-transform: rotate(360deg)} from {
-webkit-transform: rotate(0deg);
}
to {
-webkit-transform: rotate(360deg);
}
} }
@-moz-keyframes rotateloading{from{-moz-transform: rotate(0deg)} @-moz-keyframes rotateloading {
to{-moz-transform: rotate(359deg)} from {
-moz-transform: rotate(0deg);
}
to {
-moz-transform: rotate(359deg);
}
} }
@-o-keyframes rotateloading{from{-o-transform: rotate(0deg)} @-o-keyframes rotateloading {
to{-o-transform: rotate(359deg)} from {
-o-transform: rotate(0deg);
}
to {
-o-transform: rotate(359deg);
}
} }
@keyframes rotateloading{from{transform: rotate(0deg)} @keyframes rotateloading {
to{transform: rotate(359deg)} from {
transform: rotate(0deg);
}
to {
transform: rotate(359deg);
}
} }
Loading…
Cancel
Save