From 60a00490c6706228de22feedf9ea9c6b5a40e934 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Wed, 2 Mar 2022 20:01:13 +0800 Subject: [PATCH] [CI][UI Next][V1.0.0-Alpha] Add frontend UI to CI checks and fix the linting problems found (#8666) --- .github/workflows/frontend.yml | 1 - dolphinscheduler-ui-next/.eslintrc.js | 11 ++--- .../form/fields/custom-parameters.ts | 2 +- .../components/form/fields/multi-condition.ts | 4 +- .../src/components/form/fields/multi-input.ts | 2 +- .../components/form/get-elements-by-json.ts | 12 +----- .../src/components/form/use-form.ts | 2 +- .../components/sidebar/use-menuClick.ts | 2 +- .../content/components/user/use-dropdown.ts | 2 +- .../src/layouts/content/use-dataList.ts | 40 +++++++++---------- .../src/service/modules/lineages/index.ts | 2 +- .../modules/process-definition/index.ts | 2 - .../src/service/modules/resources/index.ts | 6 +-- .../src/service/modules/schedules/index.ts | 2 - .../service/modules/task-instances/index.ts | 2 +- .../src/service/modules/token/index.ts | 2 +- .../src/utils/truncate-text.ts | 4 +- .../rule/components/rule-modal.tsx | 2 +- .../src/views/data-quality/rule/index.tsx | 2 +- .../src/views/data-quality/rule/use-table.ts | 6 +-- .../data-quality/task-result/use-table.ts | 2 +- .../views/datasource/list/json-highlight.tsx | 2 +- .../src/views/datasource/list/use-columns.ts | 3 +- .../src/views/datasource/list/use-table.ts | 2 +- .../src/views/home/use-table.ts | 2 +- .../src/views/home/use-task-state.ts | 2 +- .../views/monitor/servers/worker/index.tsx | 4 +- .../monitor/statistics/audit-log/use-table.ts | 2 +- .../src/views/projects/list/use-table.ts | 10 ++--- .../projects/overview/use-process-state.ts | 2 +- .../views/projects/overview/use-task-state.ts | 2 +- .../components/node/fields/use-datasource.ts | 2 +- .../task/components/node/fields/use-datax.ts | 6 +-- .../components/node/fields/use-dependent.ts | 11 +++-- .../components/node/fields/use-sea-tunnel.ts | 6 +-- .../components/node/fields/use-sql-type.ts | 2 +- .../node/fields/use-sqoop-target-type.ts | 1 - .../task/components/node/fields/use-switch.ts | 2 +- .../task/components/node/format-data.ts | 4 +- .../components/node/tasks/use-conditions.ts | 2 +- .../components/node/tasks/use-procedure.ts | 3 -- .../task/definition/components/use-move.ts | 2 +- .../task/definition/components/use-version.ts | 2 +- .../definition/components/version-modal.tsx | 2 +- .../projects/task/definition/use-table.ts | 18 ++++++--- .../projects/task/definition/use-task.ts | 2 +- .../task/instance/components/log-modal.tsx | 2 +- .../views/projects/task/instance/use-table.ts | 16 +++++--- .../components/dag/dag-auto-layout-modal.tsx | 2 +- .../components/dag/use-cell-update.ts | 1 - .../components/dag/use-custom-cell-builder.ts | 2 +- .../workflow/components/dag/use-task-edit.ts | 1 - .../workflow/components/dag/use-text-copy.ts | 2 +- .../workflow/definition/create/index.tsx | 2 +- .../workflow/definition/detail/index.tsx | 2 +- .../instance/components/log-modal.tsx | 2 +- .../workflow/relation/components/Graph.tsx | 4 -- .../workflow/relation/use-relation.ts | 1 - .../option/components/form-modal.tsx | 15 +++---- .../resource/task-group/option/index.tsx | 4 +- .../resource/task-group/option/use-table.ts | 22 +++++----- .../queue/components/form-modal.tsx | 12 +----- .../queue/components/table-action.tsx | 1 - .../views/resource/task-group/queue/index.tsx | 13 ++---- .../resource/task-group/queue/use-form.ts | 3 +- .../resource/task-group/queue/use-table.ts | 12 ++---- .../security/alarm-group-manage/use-table.ts | 10 +++-- .../alarm-instance-manage/use-columns.ts | 2 +- .../alarm-instance-manage/use-table.ts | 2 +- .../security/environment-manage/use-table.ts | 10 +++-- .../components/use-modal.ts | 8 ++-- .../k8s-namespace-manage/use-table.ts | 10 +++-- .../tenant-manage/components/tenant-modal.tsx | 2 +- .../tenant-manage/components/use-modalData.ts | 8 ++-- .../views/security/tenant-manage/use-table.ts | 10 +++-- .../token-manage/components/use-modal.ts | 2 - .../views/security/token-manage/use-table.ts | 15 ++++--- .../views/security/user-manage/use-table.tsx | 4 +- .../security/worker-group-manage/use-table.ts | 10 +++-- .../yarn-queue-manage/components/use-modal.ts | 2 +- .../security/yarn-queue-manage/use-table.ts | 5 ++- 81 files changed, 200 insertions(+), 225 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 4ab1e0d6c..64bcb2f7b 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -57,7 +57,6 @@ jobs: node-version: 8 - name: Compile and Build run: | - npm install node-sass --unsafe-perm npm install npm run lint npm run build diff --git a/dolphinscheduler-ui-next/.eslintrc.js b/dolphinscheduler-ui-next/.eslintrc.js index 10cafc563..7068803e0 100644 --- a/dolphinscheduler-ui-next/.eslintrc.js +++ b/dolphinscheduler-ui-next/.eslintrc.js @@ -48,15 +48,15 @@ module.exports = { '@typescript-eslint/no-unused-vars': [ 'error', { - argsIgnorePattern: '^h$', - varsIgnorePattern: '^h$' + argsIgnorePattern: '^(unused|ignored).*$', + varsIgnorePattern: '^(unused|ignored).*$' } ], 'no-unused-vars': [ 'error', { - argsIgnorePattern: '^h$', - varsIgnorePattern: '^h$' + argsIgnorePattern: '^(unused|ignored).*$', + varsIgnorePattern: '^(unused|ignored).*$' } ], 'space-before-function-paren': 'off', @@ -65,6 +65,7 @@ module.exports = { 'vue/multi-word-component-names': 'off', 'vue/component-definition-name-casing': 'off', 'vue/require-valid-default-prop': 'off', - 'no-console': 'error' + 'no-console': 'error', + 'vue/no-setup-props-destructure': 'off', } } diff --git a/dolphinscheduler-ui-next/src/components/form/fields/custom-parameters.ts b/dolphinscheduler-ui-next/src/components/form/fields/custom-parameters.ts index 0f57d0832..5ca4a4449 100644 --- a/dolphinscheduler-ui-next/src/components/form/fields/custom-parameters.ts +++ b/dolphinscheduler-ui-next/src/components/form/fields/custom-parameters.ts @@ -103,7 +103,7 @@ export function renderCustomParameters( const { field, children = [] } = mergedItem const { defaultValue, ruleItem } = getDefaultValue(children) rules.push(ruleItem) - const getChild = (item: object, i: number, disabled: boolean) => + const getChild = (item: object, i: number, unused: boolean) => children.map((child: IJsonItem) => { const mergedChild = isFunction(child) ? child(i) : child return h( diff --git a/dolphinscheduler-ui-next/src/components/form/fields/multi-condition.ts b/dolphinscheduler-ui-next/src/components/form/fields/multi-condition.ts index 795a1e0d5..2859b0e99 100644 --- a/dolphinscheduler-ui-next/src/components/form/fields/multi-condition.ts +++ b/dolphinscheduler-ui-next/src/components/form/fields/multi-condition.ts @@ -66,9 +66,9 @@ const MultiCondition = defineComponent({ export function renderMultiCondition( item: IJsonItem, fields: { [field: string]: any }, - rules: { [key: string]: FormItemRule }[] + unused: { [key: string]: FormItemRule }[] ) { - let ruleItem: { [key: string]: FormItemRule } = {} + const ruleItem: { [key: string]: FormItemRule } = {} // the fields is the data of the task definition. // the item is the options of this component in the form. diff --git a/dolphinscheduler-ui-next/src/components/form/fields/multi-input.ts b/dolphinscheduler-ui-next/src/components/form/fields/multi-input.ts index 2084e68b1..e0495c09f 100644 --- a/dolphinscheduler-ui-next/src/components/form/fields/multi-input.ts +++ b/dolphinscheduler-ui-next/src/components/form/fields/multi-input.ts @@ -71,7 +71,7 @@ const MultiInput = defineComponent({ export function renderMultiInput( item: IJsonItem, fields: { [field: string]: any }, - rules: { [key: string]: FormItemRule }[] + unused: { [key: string]: FormItemRule }[] ) { const { field } = isFunction(item) ? item() : item // the fields is the data of the task definition. diff --git a/dolphinscheduler-ui-next/src/components/form/get-elements-by-json.ts b/dolphinscheduler-ui-next/src/components/form/get-elements-by-json.ts index b36673438..753bdb11e 100644 --- a/dolphinscheduler-ui-next/src/components/form/get-elements-by-json.ts +++ b/dolphinscheduler-ui-next/src/components/form/get-elements-by-json.ts @@ -29,17 +29,9 @@ export default function getElementByJson( const rules: FormRules = {} const initialValues: { [field: string]: any } = {} const elements: IFormItem[] = [] - for (let item of json) { + for (const item of json) { const mergedItem = isFunction(item) ? item() : item - const { - name, - value, - field, - span = 24, - children, - validate, - ...rest - } = mergedItem + const { name, value, field, children, validate, ...rest } = mergedItem if (value || value === 0) { fields[field] = value initialValues[field] = value diff --git a/dolphinscheduler-ui-next/src/components/form/use-form.ts b/dolphinscheduler-ui-next/src/components/form/use-form.ts index f96b56f0a..b474d521d 100644 --- a/dolphinscheduler-ui-next/src/components/form/use-form.ts +++ b/dolphinscheduler-ui-next/src/components/form/use-form.ts @@ -27,7 +27,7 @@ export function useForm() { } const setValues = (initialValues: { [field: string]: any }) => { - for (let [key, value] of Object.entries(initialValues)) { + for (const [key, value] of Object.entries(initialValues)) { state.formRef.model[key] = value } } diff --git a/dolphinscheduler-ui-next/src/layouts/content/components/sidebar/use-menuClick.ts b/dolphinscheduler-ui-next/src/layouts/content/components/sidebar/use-menuClick.ts index d2897a733..fbf235c94 100644 --- a/dolphinscheduler-ui-next/src/layouts/content/components/sidebar/use-menuClick.ts +++ b/dolphinscheduler-ui-next/src/layouts/content/components/sidebar/use-menuClick.ts @@ -22,7 +22,7 @@ import { MenuOption } from 'naive-ui' export function useMenuClick() { const router: Router = useRouter() - const handleMenuClick = (key: string, item: MenuOption) => { + const handleMenuClick = (key: string, unused: MenuOption) => { // console.log(key, item) router.push({ path: `${key}` }) } diff --git a/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts b/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts index 634e59b10..123669b71 100644 --- a/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts +++ b/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts @@ -27,7 +27,7 @@ export function useDropDown() { const userStore = useUserStore() const menuStore = useMenuStore() - const handleSelect = (key: string | number, option: DropdownOption) => { + const handleSelect = (key: string | number, unused: DropdownOption) => { menuStore.setMenuKey('') if (key === 'logout') { useLogout() diff --git a/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts b/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts index 0d6da1c84..a82a0fa81 100644 --- a/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts +++ b/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts @@ -141,7 +141,7 @@ export function useDataList() { children: [ { label: t('menu.file_manage'), - key: `/resource/file-manage`, + key: '/resource/file-manage', icon: renderIcon(FileSearchOutlined) }, { @@ -151,11 +151,11 @@ export function useDataList() { children: [ { label: t('menu.resource_manage'), - key: `/resource/resource-manage` + key: '/resource/resource-manage' }, { label: t('menu.function_manage'), - key: `/resource/function-manage` + key: '/resource/function-manage' } ] }, @@ -183,12 +183,12 @@ export function useDataList() { children: [ { label: t('menu.task_result'), - key: `/data-quality/task-result`, + key: '/data-quality/task-result', icon: renderIcon(ApartmentOutlined) }, { label: t('menu.rule'), - key: `/data-quality/rule`, + key: '/data-quality/rule', icon: renderIcon(BarsOutlined) } ] @@ -211,15 +211,15 @@ export function useDataList() { children: [ { label: t('menu.master'), - key: `/monitor/master` + key: '/monitor/master' }, { label: t('menu.worker'), - key: `/monitor/worker` + key: '/monitor/worker' }, { label: t('menu.db'), - key: `/monitor/db` + key: '/monitor/db' } ] }, @@ -230,11 +230,11 @@ export function useDataList() { children: [ { label: t('menu.statistics'), - key: `/monitor/statistics` + key: '/monitor/statistics' }, { label: t('menu.audit_log'), - key: `/monitor/audit-log` + key: '/monitor/audit-log' } ] } @@ -249,54 +249,54 @@ export function useDataList() { ? [ { label: t('menu.tenant_manage'), - key: `/security/tenant-manage`, + key: '/security/tenant-manage', icon: renderIcon(UsergroupAddOutlined) }, { label: t('menu.user_manage'), - key: `/security/user-manage`, + key: '/security/user-manage', icon: renderIcon(UserAddOutlined) }, { label: t('menu.alarm_group_manage'), - key: `/security/alarm-group-manage`, + key: '/security/alarm-group-manage', icon: renderIcon(WarningOutlined) }, { label: t('menu.alarm_instance_manage'), - key: `/security/alarm-instance-manage`, + key: '/security/alarm-instance-manage', icon: renderIcon(InfoCircleOutlined) }, { label: t('menu.worker_group_manage'), - key: `/security/worker-group-manage`, + key: '/security/worker-group-manage', icon: renderIcon(ControlOutlined) }, { label: t('menu.yarn_queue_manage'), - key: `/security/yarn-queue-manage`, + key: '/security/yarn-queue-manage', icon: renderIcon(SlackOutlined) }, { label: t('menu.environment_manage'), - key: `/security/environment-manage`, + key: '/security/environment-manage', icon: renderIcon(EnvironmentOutlined) }, { label: t('menu.k8s_namespace_manage'), - key: `/security/k8s-namespace-manage`, + key: '/security/k8s-namespace-manage', icon: renderIcon(CloudServerOutlined) }, { label: t('menu.token_manage'), - key: `/security/token-manage`, + key: '/security/token-manage', icon: renderIcon(SafetyOutlined) } ] : [ { label: t('menu.token_manage'), - key: `/security/token-manage`, + key: '/security/token-manage', icon: renderIcon(SafetyOutlined) } ] diff --git a/dolphinscheduler-ui-next/src/service/modules/lineages/index.ts b/dolphinscheduler-ui-next/src/service/modules/lineages/index.ts index 982ed907c..2eca2d18b 100644 --- a/dolphinscheduler-ui-next/src/service/modules/lineages/index.ts +++ b/dolphinscheduler-ui-next/src/service/modules/lineages/index.ts @@ -16,7 +16,7 @@ */ import { axios } from '@/service/service' -import { ProjectCodeReq, WorkFlowNameReq, WorkflowCodeReq } from './types' +import { ProjectCodeReq, WorkflowCodeReq } from './types' export function queryWorkFlowList(projectCode: ProjectCodeReq): any { return axios({ diff --git a/dolphinscheduler-ui-next/src/service/modules/process-definition/index.ts b/dolphinscheduler-ui-next/src/service/modules/process-definition/index.ts index 0d329fdf6..015c80ca3 100644 --- a/dolphinscheduler-ui-next/src/service/modules/process-definition/index.ts +++ b/dolphinscheduler-ui-next/src/service/modules/process-definition/index.ts @@ -19,10 +19,8 @@ import { axios } from '@/service/service' import { CodeReq, CodesReq, - FileReq, NameReq, ReleaseStateReq, - VersionReq, LimitReq, PageReq, ListReq, diff --git a/dolphinscheduler-ui-next/src/service/modules/resources/index.ts b/dolphinscheduler-ui-next/src/service/modules/resources/index.ts index d2088ddf0..dc06961cf 100644 --- a/dolphinscheduler-ui-next/src/service/modules/resources/index.ts +++ b/dolphinscheduler-ui-next/src/service/modules/resources/index.ts @@ -18,7 +18,6 @@ import { axios, downloadFile } from '@/service/service' import { ResourceTypeReq, - UdfTypeReq, NameReq, FileNameReq, FullNameReq, @@ -223,10 +222,7 @@ export function updateResourceContent(data: ContentReq, id: number): any { }) } -export function viewResource( - params: ViewResourceReq, - id: number -): any { +export function viewResource(params: ViewResourceReq, id: number): any { return axios({ url: `/resources/${id}/view`, method: 'get', diff --git a/dolphinscheduler-ui-next/src/service/modules/schedules/index.ts b/dolphinscheduler-ui-next/src/service/modules/schedules/index.ts index e8c8557e6..ae530658f 100644 --- a/dolphinscheduler-ui-next/src/service/modules/schedules/index.ts +++ b/dolphinscheduler-ui-next/src/service/modules/schedules/index.ts @@ -18,13 +18,11 @@ import { axios } from '@/service/service' import { ProjectCodeReq, - IdReq, CodeReq, ListReq, ScheduleReq, WorkerGroupIdReq, CreateScheduleReq, - DeleteScheduleReq, ProcessDefinitionCodeReq } from './types' diff --git a/dolphinscheduler-ui-next/src/service/modules/task-instances/index.ts b/dolphinscheduler-ui-next/src/service/modules/task-instances/index.ts index 205a1cc10..def8a8f50 100644 --- a/dolphinscheduler-ui-next/src/service/modules/task-instances/index.ts +++ b/dolphinscheduler-ui-next/src/service/modules/task-instances/index.ts @@ -37,5 +37,5 @@ export function forceSuccess(taskId: IdReq, projectCode: ProjectCodeReq): any { } export function downloadLog(id: number): void { - downloadFile(`log/download-log`, { taskInstanceId: id }) + downloadFile('log/download-log', { taskInstanceId: id }) } diff --git a/dolphinscheduler-ui-next/src/service/modules/token/index.ts b/dolphinscheduler-ui-next/src/service/modules/token/index.ts index 69a898d0f..c279125cb 100644 --- a/dolphinscheduler-ui-next/src/service/modules/token/index.ts +++ b/dolphinscheduler-ui-next/src/service/modules/token/index.ts @@ -60,7 +60,7 @@ export function deleteToken(id: number): any { export function generateToken(data: TokenReq): any { return axios({ - url: `/access-tokens/generate`, + url: '/access-tokens/generate', method: 'post', data }) diff --git a/dolphinscheduler-ui-next/src/utils/truncate-text.ts b/dolphinscheduler-ui-next/src/utils/truncate-text.ts index a12787591..4f7b95eb3 100644 --- a/dolphinscheduler-ui-next/src/utils/truncate-text.ts +++ b/dolphinscheduler-ui-next/src/utils/truncate-text.ts @@ -25,7 +25,7 @@ export default function truncateText(text: string, n: number) { const exp = /[\u4E00-\u9FA5]/ let res = '' let len = text.length - let chinese = text.match(new RegExp(exp, 'g')) + const chinese = text.match(new RegExp(exp, 'g')) if (chinese) { len += chinese.length } @@ -33,7 +33,7 @@ export default function truncateText(text: string, n: number) { let i = 0 let acc = 0 while (true) { - let char = text[i] + const char = text[i] if (exp.test(char)) { acc += 2 } else { diff --git a/dolphinscheduler-ui-next/src/views/data-quality/rule/components/rule-modal.tsx b/dolphinscheduler-ui-next/src/views/data-quality/rule/components/rule-modal.tsx index af661520d..9afffc188 100644 --- a/dolphinscheduler-ui-next/src/views/data-quality/rule/components/rule-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/data-quality/rule/components/rule-modal.tsx @@ -15,7 +15,7 @@ * limitations under the License. */ -import { defineComponent, h, PropType, reactive, ref, toRefs, watch } from 'vue' +import { defineComponent, PropType } from 'vue' import { useI18n } from 'vue-i18n' import { NDataTable } from 'naive-ui' import Modal from '@/components/modal' diff --git a/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx b/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx index e036fcb70..662091267 100644 --- a/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx +++ b/dolphinscheduler-ui-next/src/views/data-quality/rule/index.tsx @@ -15,7 +15,7 @@ * limitations under the License. */ -import { defineComponent, onMounted, ref, toRefs, watch } from 'vue' +import { defineComponent, onMounted, ref, toRefs } from 'vue' import { NSpace, NInput, diff --git a/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts b/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts index b0d8fbfd7..667712718 100644 --- a/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts @@ -19,13 +19,13 @@ import { useI18n } from 'vue-i18n' import { h, reactive, ref } from 'vue' import { useAsyncState } from '@vueuse/core' import { queryRuleListPaging } from '@/service/modules/data-quality' -import type { Rule, RuleRes } from '@/service/modules/data-quality/types' +import type { RuleRes } from '@/service/modules/data-quality/types' import TableAction from './components/table-action' import _ from 'lodash' import { parseISO, format } from 'date-fns' import { TableColumns } from 'naive-ui/es/data-table/src/interface' -export function useTable(viewRuleEntry = (ruleJson: string): void => {}) { +export function useTable(viewRuleEntry = (unusedRuleJson: string): void => {}) { const { t } = useI18n() const variables = reactive({ @@ -106,7 +106,7 @@ export function useTable(viewRuleEntry = (ruleJson: string): void => {}) { const { state } = useAsyncState( queryRuleListPaging(data).then((res: RuleRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { const ruleName = 'data_quality.rule.' + item.name.substring(3, item.name.length - 1) const ruleNameLocale = t(ruleName) diff --git a/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts b/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts index b277fe186..44ea76a84 100644 --- a/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts @@ -180,7 +180,7 @@ export function useTable() { const { state } = useAsyncState( queryExecuteResultListPaging(data).then((res: ResultListRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { return { ...item } diff --git a/dolphinscheduler-ui-next/src/views/datasource/list/json-highlight.tsx b/dolphinscheduler-ui-next/src/views/datasource/list/json-highlight.tsx index c69cf0092..017702217 100644 --- a/dolphinscheduler-ui-next/src/views/datasource/list/json-highlight.tsx +++ b/dolphinscheduler-ui-next/src/views/datasource/list/json-highlight.tsx @@ -15,7 +15,7 @@ * limitations under the License. */ -import { defineComponent, PropType, h } from 'vue' +import { defineComponent, PropType } from 'vue' import { NText } from 'naive-ui' import { isBoolean, isNumber, isPlainObject } from 'lodash' import styles from './json-highlight.module.scss' diff --git a/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts b/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts index 0255fd3d9..5a0f556d1 100644 --- a/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts +++ b/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts @@ -20,7 +20,6 @@ import { useI18n } from 'vue-i18n' import { NPopover, NButton, NIcon, NPopconfirm, NSpace } from 'naive-ui' import { EditOutlined, DeleteOutlined } from '@vicons/antd' import JsonHighlight from './json-highlight' -import styles from './index.module.scss' import { TableColumns } from './types' export function useColumns(onCallback: Function) { @@ -84,7 +83,7 @@ export function useColumns(onCallback: Function) { title: t('datasource.operation'), key: 'operation', width: 150, - render: (rowData, rowIndex) => { + render: (rowData, unused) => { return h(NSpace, null, { default: () => [ h( diff --git a/dolphinscheduler-ui-next/src/views/datasource/list/use-table.ts b/dolphinscheduler-ui-next/src/views/datasource/list/use-table.ts index bcb3c3df0..cc64ddb3b 100644 --- a/dolphinscheduler-ui-next/src/views/datasource/list/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/datasource/list/use-table.ts @@ -60,7 +60,7 @@ export function useTable() { const deleteRecord = async (id: number) => { try { - const res = await deleteDataSource(id) + const ignored = await deleteDataSource(id) updateList() } catch (e) { window.$message.error((e as Error).message) diff --git a/dolphinscheduler-ui-next/src/views/home/use-table.ts b/dolphinscheduler-ui-next/src/views/home/use-table.ts index 10e694702..da4fb577a 100644 --- a/dolphinscheduler-ui-next/src/views/home/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/home/use-table.ts @@ -22,7 +22,7 @@ export function useTable() { const { t } = useI18n() const columnsRef: TableColumns = [ - { title: '#', key: 'index',render: (row, index) => index + 1}, + { title: '#', key: 'index', render: (row, index) => index + 1 }, { title: t('home.number'), key: 'number' }, { title: t('home.state'), key: 'state' } ] diff --git a/dolphinscheduler-ui-next/src/views/home/use-task-state.ts b/dolphinscheduler-ui-next/src/views/home/use-task-state.ts index d940e9450..3c624e2c2 100644 --- a/dolphinscheduler-ui-next/src/views/home/use-task-state.ts +++ b/dolphinscheduler-ui-next/src/views/home/use-task-state.ts @@ -29,7 +29,7 @@ export function useTaskState() { endDate: !date ? '' : format(date[1], 'yyyy-MM-dd HH:mm:ss'), projectCode: 0 }).then((res: TaskStateRes): StateData => { - const table = res.taskCountDtos.map((item, index) => { + const table = res.taskCountDtos.map((item, unused) => { return { state: item.taskStateType, number: item.count diff --git a/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx b/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx index 7ea27b40f..4c556d2a4 100644 --- a/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx +++ b/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx @@ -35,7 +35,7 @@ const master = defineComponent({ const { getWorker } = useWorker() const workerRef: Ref> = ref(getWorker()) const columnsRef: TableColumns = [ - { title: '#', key: 'index',render: (row, index) => index + 1 }, + { title: '#', key: 'index', render: (row, index) => index + 1 }, { title: t('monitor.worker.directory'), key: 'directory' } ] @@ -121,7 +121,7 @@ const master = defineComponent({ workerRef[0] && ( { + data={workerRef[0].zkDirectories.map((item, unused) => { return { directory: item } })} striped diff --git a/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts b/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts index 9492b8069..4a2447558 100644 --- a/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts @@ -84,7 +84,7 @@ export function useTable() { const { state } = useAsyncState( queryAuditLogListPaging(data).then((res: AuditListRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { return { ...item } diff --git a/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts index f8b298c77..f85e9aeb1 100644 --- a/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts @@ -30,9 +30,9 @@ import { useMenuStore } from '@/store/menu/menu' export function useTable( updateProjectItem = ( - code: number, - name: string, - description: string + unusedCode: number, + unusedName: string, + unusedDescription: string ): void => {}, resetTableData = () => {} ) { @@ -41,7 +41,7 @@ export function useTable( const menuStore = useMenuStore() const columns: TableColumns = [ - { title: '#', key: 'index',render: (row, index) => index + 1 }, + { title: '#', key: 'index', render: (row, index) => index + 1 }, { title: t('project.list.project_name'), key: 'name', @@ -101,7 +101,7 @@ export function useTable( const { state } = useAsyncState( queryProjectListPaging(params).then((res: ProjectRes) => { variables.totalPage = res.totalPage - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { item.createTime = format( parseISO(item.createTime), 'yyyy-MM-dd HH:mm:ss' diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts b/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts index db238e74e..f368b99d4 100644 --- a/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts +++ b/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts @@ -32,7 +32,7 @@ export function useProcessState() { endDate: !date ? '' : format(date[1], 'yyyy-MM-dd HH:mm:ss'), projectCode: Number(route.params.projectCode) }).then((res: TaskStateRes): StateData => { - const table = res.taskCountDtos.map((item, index) => { + const table = res.taskCountDtos.map((item, unused) => { return { state: item.taskStateType, number: item.count diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts b/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts index bcdcbbd85..eaea86be5 100644 --- a/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts +++ b/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts @@ -32,7 +32,7 @@ export function useTaskState() { endDate: !date ? '' : format(date[1], 'yyyy-MM-dd HH:mm:ss'), projectCode: Number(route.params.projectCode) }).then((res: TaskStateRes): StateData => { - const table = res.taskCountDtos.map((item, index) => { + const table = res.taskCountDtos.map((item, unused) => { return { state: item.taskStateType, number: item.count diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datasource.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datasource.ts index de1131886..6ed8ab60c 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datasource.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datasource.ts @@ -53,7 +53,7 @@ export function useDatasource( options.value.push({ label: item.name, value: String(item.id) }) }) if (options.value && model.datasource) { - let item = find(options.value, { value: String(model.datasource) }) + const item = find(options.value, { value: String(model.datasource) }) if (!item) { model.datasource = null } diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datax.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datax.ts index 6ceaa7a7b..cd1851423 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datax.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datax.ts @@ -17,7 +17,7 @@ import { ref, onMounted, watch } from 'vue' import { useI18n } from 'vue-i18n' import type { IJsonItem } from '../types' -import { find, indexOf } from 'lodash' +import { find } from 'lodash' import { TypeReq } from '@/service/modules/data-source/types' import { queryDataSourceList } from '@/service/modules/data-source' @@ -171,7 +171,7 @@ export function useDataX(model: { [field: string]: any }): IJsonItem[] { datasourceOptions.value.push({ label: item.name, value: String(item.id) }) }) if (datasourceOptions.value && model.dataSource) { - let item = find(datasourceOptions.value, { + const item = find(datasourceOptions.value, { value: String(model.dataSource) }) if (!item) { @@ -191,7 +191,7 @@ export function useDataX(model: { [field: string]: any }): IJsonItem[] { }) }) if (destinationDatasourceOptions.value && model.dataTarget) { - let item = find(destinationDatasourceOptions.value, { + const item = find(destinationDatasourceOptions.value, { value: String(model.dataTarget) }) if (!item) { diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts index 74df0bceb..66f71da2a 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts @@ -227,7 +227,6 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { dependItem.definitionCode ) } - console.log(dependItem) if (dependItem.cycle) { dependItem.dateOptions = DATE_LSIT[dependItem.cycle] } @@ -240,7 +239,7 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { ...useDependentTimeout(model), ...useRelationCustomParams({ model, - children: (i: number = 0) => ({ + children: (i = 0) => ({ type: 'custom-parameters', field: 'dependItemList', span: 18, @@ -260,7 +259,7 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { }, options: projectList }), - (j: number = 0) => ({ + (j = 0) => ({ type: 'select', field: 'definitionCode', span: 12, @@ -279,7 +278,7 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { model.dependTaskList[i]?.dependItemList[j] ?.definitionCodeOptions || [] }), - (j: number = 0) => ({ + (j = 0) => ({ type: 'select', field: 'depTaskCode', span: 12, @@ -290,7 +289,7 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { model.dependTaskList[i]?.dependItemList[j]?.depTaskCodeOptions || [] }), - (j: number = 0) => ({ + (j = 0) => ({ type: 'select', field: 'cycle', span: 12, @@ -302,7 +301,7 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { }, options: CYCLE_LIST }), - (j: number = 0) => ({ + (j = 0) => ({ type: 'select', field: 'dateValue', span: 12, diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sea-tunnel.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sea-tunnel.ts index 833e8306b..eacb9118e 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sea-tunnel.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sea-tunnel.ts @@ -117,12 +117,12 @@ export function useSeaTunnel(model: { [field: string]: any }): IJsonItem[] { const parseRawScript = () => { if (model.rawScript) { model.rawScript.split('\n').forEach((script: string) => { - let params = script.replace(baseScript, '').split('--') + const params = script.replace(baseScript, '').split('--') params?.forEach((param: string) => { - let pair = param.split(' ') + const pair = param.split(' ') if (pair && pair.length >= 2) { if (pair[0] === 'master') { - let prefix = pair[1].substring(0, 8) + const prefix = pair[1].substring(0, 8) if (pair[1] && (prefix === 'mesos://' || prefix === 'spark://')) { model.master = prefix model.masterUrl = pair[1].substring(8, pair[1].length) diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts index e46c41649..c005f9ea5 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts @@ -19,7 +19,7 @@ import { ref, onMounted } from 'vue' import { useI18n } from 'vue-i18n' import type { IJsonItem } from '../types' -export function useSqlType(model: { [field: string]: any }): IJsonItem { +export function useSqlType(unusedModel: { [field: string]: any }): IJsonItem { const { t } = useI18n() const options = ref([] as { label: string; value: string }[]) diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sqoop-target-type.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sqoop-target-type.ts index 2797511f3..5bf052a04 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sqoop-target-type.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sqoop-target-type.ts @@ -92,7 +92,6 @@ export function useTargetType(model: { [field: string]: any }): IJsonItem[] { watch( () => [model.sourceType, model.srcQueryType], ([sourceType, srcQueryType]) => { - console.log(sourceType, srcQueryType) getTargetTypesBySourceType(sourceType, srcQueryType) } ) diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-switch.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-switch.ts index 34ad995e4..a58b8bcb9 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-switch.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-switch.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { nextTick, onMounted, ref, watch } from 'vue' +import { ref, watch } from 'vue' import { useI18n } from 'vue-i18n' import type { IJsonItem } from '../types' import { queryProcessDefinitionByCode } from '@/service/modules/process-definition' diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts index 91e4d88d2..32bb97061 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts @@ -404,7 +404,7 @@ const buildRawScript = (model: INodeData) => { let master = model.master let masterUrl = model?.masterUrl ? model?.masterUrl : '' let deployMode = model.deployMode - let queue = model.queue + const queue = model.queue if (model.deployMode === 'local') { master = 'local' @@ -423,7 +423,7 @@ const buildRawScript = (model: INodeData) => { let rawScript = '' model.resourceList?.forEach((id: number) => { - let item = find(model.resourceFiles, { id: id }) + const item = find(model.resourceFiles, { id: id }) rawScript = rawScript + diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-conditions.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-conditions.ts index d3810f0e2..d6c9b6d94 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-conditions.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-conditions.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { reactive, watch } from 'vue' +import { reactive } from 'vue' import * as Fields from '../fields/index' import type { IJsonItem, INodeData, ITaskData } from '../types' diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts index 5c35866c9..2fb081599 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts @@ -19,7 +19,6 @@ import { reactive } from 'vue' import * as Fields from '../fields/index' import type { IJsonItem, INodeData } from '../types' import { ITaskData } from '../types' -import { useI18n } from 'vue-i18n' export function useProcedure({ projectCode, @@ -32,8 +31,6 @@ export function useProcedure({ readonly?: boolean data?: ITaskData }) { - const { t } = useI18n() - const model = reactive({ name: '', taskType: 'PROCEDURE', diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-move.ts b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-move.ts index 7dc5bbfab..ac392b77b 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-move.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-move.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { reactive, ref, SetupContext } from 'vue' +import { reactive, ref } from 'vue' import { useI18n } from 'vue-i18n' import { useAsyncState } from '@vueuse/core' import { querySimpleList } from '@/service/modules/process-definition' diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts index 8c7d2f8c3..109aeb141 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts @@ -188,7 +188,7 @@ export function useVersion() { { code: variables.taskCode }, { projectCode } ).then((res: TaskDefinitionVersionRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { return { ...item } diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx index ca148bf68..55a7103a3 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/version-modal.tsx @@ -17,7 +17,7 @@ import { defineComponent, onMounted, PropType, toRefs, watch } from 'vue' import Modal from '@/components/modal' -import { NDataTable, NPagination, useThemeVars } from 'naive-ui' +import { NDataTable, NPagination } from 'naive-ui' import { useI18n } from 'vue-i18n' import { useVersion } from './use-version' import styles from './version.module.scss' diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts index 59cc6f179..bebaa4a71 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts @@ -143,7 +143,8 @@ export function useTable(onEdit: Function) { } }, { - icon: () => h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('project.task.edit') @@ -169,7 +170,8 @@ export function useTable(onEdit: Function) { } }, { - icon: () => h(NIcon, null, { default: () => h(DragOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(DragOutlined) }) } ), default: () => t('project.task.move') @@ -192,7 +194,10 @@ export function useTable(onEdit: Function) { } }, { - icon: () => h(NIcon, null, { default: () => h(ExclamationCircleOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(ExclamationCircleOutlined) + }) } ), default: () => t('project.task.version') @@ -223,7 +228,10 @@ export function useTable(onEdit: Function) { row.processReleaseState === 'ONLINE' }, { - icon: () => h(NIcon, null, { default: () => h(DeleteOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) } ), default: () => t('project.task.delete') @@ -272,7 +280,7 @@ export function useTable(onEdit: Function) { const { state } = useAsyncState( queryTaskDefinitionListPaging({ ...params }, { projectCode }).then( (res: TaskDefinitionRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { if (Object.keys(item.upstreamTaskMap).length > 0) { item.upstreamTaskMap = Object.keys(item.upstreamTaskMap).map( (code) => item.upstreamTaskMap[code] diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/use-task.ts b/dolphinscheduler-ui-next/src/views/projects/task/definition/use-task.ts index 9f3da28b9..2e887461e 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/use-task.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/use-task.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { reactive, onMounted } from 'vue' +import { reactive } from 'vue' import { genTaskCodeList, saveSingle, diff --git a/dolphinscheduler-ui-next/src/views/projects/task/instance/components/log-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/task/instance/components/log-modal.tsx index fdfa20803..23a44d3ab 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/instance/components/log-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/task/instance/components/log-modal.tsx @@ -15,7 +15,7 @@ * limitations under the License. */ -import { defineComponent, onMounted, PropType, toRefs, watch } from 'vue' +import { defineComponent, PropType, toRefs, watch } from 'vue' import { useI18n } from 'vue-i18n' import { NLog } from 'naive-ui' import { useModal } from './use-modal' diff --git a/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts index b0d5d82b5..f8e9a139f 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts @@ -31,7 +31,6 @@ import { } from '@vicons/antd' import { parseISO, format } from 'date-fns' import { useRoute } from 'vue-router' -import { downloadFile } from '@/service/service' import type { TaskInstancesRes } from '@/service/modules/task-instances/types' export function useTable() { @@ -145,7 +144,10 @@ export function useTable() { } }, { - icon: () => h(NIcon, null, { default: () => h(CheckCircleOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(CheckCircleOutlined) + }) } ), default: () => t('project.task.serial_wait') @@ -165,7 +167,10 @@ export function useTable() { onClick: () => handleLog(row) }, { - icon: () => h(NIcon, null, { default: () => h(AlignLeftOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(AlignLeftOutlined) + }) } ), default: () => t('project.task.view_log') @@ -185,7 +190,8 @@ export function useTable() { onClick: () => downloadLog(row.id) }, { - icon: () => h(NIcon, null, { default: () => h(DownloadOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(DownloadOutlined) }) } ), default: () => t('project.task.download_log') @@ -243,7 +249,7 @@ export function useTable() { const { state } = useAsyncState( queryTaskListPaging(data, { projectCode }).then( (res: TaskInstancesRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { item.submitTime = format( parseISO(item.submitTime), 'yyyy-MM-dd HH:mm:ss' diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx index 2beea211f..3cfcb0e1c 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx @@ -55,7 +55,7 @@ const props = { export default defineComponent({ name: 'dag-format-modal', props, - setup(props, context) { + setup(props, unusedContext) { const { t } = useI18n() const { formValue, formRef, submit, cancel } = props diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-cell-update.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-cell-update.ts index 48b77e95f..2282dfb43 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-cell-update.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-cell-update.ts @@ -64,7 +64,6 @@ export function useCellUpdate(options: Options) { coordinate: Coordinate = { x: 100, y: 100 } ) { if (!TASK_TYPES_MAP[type as TaskType]) { - console.warn(`taskType:${type} is invalid!`) return } const node = buildNode(id, type, name, flag, coordinate) diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts index a5c0ffa05..d040993ef 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts @@ -44,7 +44,7 @@ export function useCustomCellBuilder() { function buildEdge( sourceId: string, targetId: string, - label: string = '' + label = '' ): Edge.Metadata { return { shape: X6_EDGE_NAME, diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-task-edit.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-task-edit.ts index 992ff7400..08e272b7c 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-task-edit.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-task-edit.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import _ from 'lodash' import { ref, onMounted, watch } from 'vue' import type { Ref } from 'vue' import type { Graph } from '@antv/x6' diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-text-copy.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-text-copy.ts index 4bd545083..b75b39ed5 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-text-copy.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-text-copy.ts @@ -27,7 +27,7 @@ export function useTextCopy() { const { copy } = useClipboard() const message = useMessage() const copyText = (text: string) => { - copy(text).then((res) => { + copy(text).then(() => { message.success(t('project.dag.copy_success')) }) } diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/create/index.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/create/index.tsx index cb2dcfd30..90974a9ab 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/create/index.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/create/index.tsx @@ -76,7 +76,7 @@ export default defineComponent({ }, projectCode ) - .then((res: any) => { + .then((ignored: any) => { message.success(t('project.dag.success')) router.push({ path: `/projects/${projectCode}/workflow-definition` }) }) diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/detail/index.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/detail/index.tsx index b2aa4b3e4..d80a26afb 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/detail/index.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/detail/index.tsx @@ -95,7 +95,7 @@ export default defineComponent({ code, projectCode ) - .then((res: any) => { + .then((ignored: any) => { message.success(t('project.dag.success')) router.push({ path: `/projects/${projectCode}/workflow-definition` }) }) diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log-modal.tsx index 2416df2a7..68119ed5a 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log-modal.tsx @@ -28,7 +28,7 @@ import { renderSlot } from 'vue' import { useI18n } from 'vue-i18n' -import { dateEnGB, NButton, NIcon, NTooltip } from 'naive-ui' +import { NButton, NIcon, NTooltip } from 'naive-ui' import { queryLog } from '@/service/modules/log' import { DownloadOutlined, diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/relation/components/Graph.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/relation/components/Graph.tsx index 725471d8b..92d50b005 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/relation/components/Graph.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/relation/components/Graph.tsx @@ -47,8 +47,6 @@ const GraphChart = defineComponent({ const graphChartRef: Ref = ref(null) const { t } = useI18n() - console.log(props.seriesData) - const legendData = [ { name: t('project.workflow.online') }, { name: t('project.workflow.workflow_offline') }, @@ -56,8 +54,6 @@ const GraphChart = defineComponent({ ] const getCategory = (schedulerStatus: number, workflowStatus: number) => { - console.log(schedulerStatus, workflowStatus) - switch (true) { case workflowStatus === 0: return 1 diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/relation/use-relation.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/relation/use-relation.ts index 8ef7cf4f2..7515fc3ea 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/relation/use-relation.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/relation/use-relation.ts @@ -39,7 +39,6 @@ export function useRelation() { variables.seriesData = [] variables.seriesData = obj.map((item) => { - console.log(item) return { name: item.workFlowName, id: item.workFlowCode, diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/option/components/form-modal.tsx b/dolphinscheduler-ui-next/src/views/resource/task-group/option/components/form-modal.tsx index 0c01f6a17..3254c8b04 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/option/components/form-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/option/components/form-modal.tsx @@ -15,15 +15,7 @@ * limitations under the License. */ -import { - defineComponent, - PropType, - toRefs, - onMounted, - ref, - toRaw, - Ref -} from 'vue' +import { defineComponent, PropType, toRefs, onMounted, ref, Ref } from 'vue' import { NForm, NFormItem, NInput, NSelect } from 'naive-ui' import { useForm } from '../use-form' import Modal from '@/components/modal' @@ -56,7 +48,10 @@ const FormModal = defineComponent({ onMounted(() => { queryAllProjectList().then((res: any[]) => { res.map((item) => { - let option: SelectMixedOption = { label: item.name, value: item.code } + const option: SelectMixedOption = { + label: item.name, + value: item.code + } projectOptions.value.push(option) }) }) diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/option/index.tsx b/dolphinscheduler-ui-next/src/views/resource/task-group/option/index.tsx index 75e99cb05..18306a535 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/option/index.tsx +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/option/index.tsx @@ -22,9 +22,7 @@ import { NInput, NCard, NDataTable, - NSwitch, - NPagination, - NTooltip + NPagination } from 'naive-ui' import Card from '@/components/card' import { SearchOutlined } from '@vicons/antd' diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts index 1d3272fd5..b698b7177 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts @@ -15,12 +15,9 @@ * limitations under the License. */ -import { useAsyncState, useAsyncQueue } from '@vueuse/core' import { h, reactive, ref } from 'vue' import { useI18n } from 'vue-i18n' import { parseISO, format } from 'date-fns' -import { useRouter } from 'vue-router' -import type { Router } from 'vue-router' import type { TableColumns } from 'naive-ui/es/data-table/src/interface' import { queryTaskGroupListPaging } from '@/service/modules/task-group' import { queryAllProjectList } from '@/service/modules/projects' @@ -29,20 +26,19 @@ import _ from 'lodash' export function useTable( updateItem = ( - id: number, - name: string, - projectCode: number, - groupSize: number, - description: string, - status: number + unusedId: number, + unusedName: string, + unusedProjectCode: number, + unusedGroupSize: number, + unusedDescription: string, + unusedStatus: number ): void => {}, resetTableData = () => {} ) { const { t } = useI18n() - const router: Router = useRouter() const columns: TableColumns = [ - { title: '#', key: 'index',render: (row, index) => index + 1 }, + { title: '#', key: 'index', render: (row, index) => index + 1 }, { title: t('resource.task_group_option.name'), key: 'name' }, { title: t('resource.task_group_option.project_name'), key: 'projectName' }, { @@ -96,10 +92,10 @@ export function useTable( (values: any[]) => { variables.totalPage = values[0].totalPage variables.tableData = values[0].totalList.map( - (item: any, index: number) => { + (item: any, unused: number) => { let projectName = '' if (values[1]) { - let project = _.find(values[1], { code: item.projectCode }) + const project = _.find(values[1], { code: item.projectCode }) if (project) { projectName = project.name } diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/form-modal.tsx b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/form-modal.tsx index 6656547f2..8abf70747 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/form-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/form-modal.tsx @@ -15,15 +15,7 @@ * limitations under the License. */ -import { - defineComponent, - PropType, - toRefs, - ref, - toRaw, - Ref, - onMounted -} from 'vue' +import { defineComponent, PropType, toRefs, onMounted } from 'vue' import { NForm, NFormItem, NInput } from 'naive-ui' import { useForm } from '../use-form' import Modal from '@/components/modal' @@ -52,7 +44,7 @@ const FormModal = defineComponent({ }) const onConfirm = () => { - let value = state.formData.priority + '' + const value = state.formData.priority + '' if (value) { modifyTaskGroupQueuePriority(state.formData).then(() => { emit('confirm') diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/table-action.tsx b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/table-action.tsx index 52782a4a8..b0877aa70 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/table-action.tsx +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/components/table-action.tsx @@ -21,7 +21,6 @@ import { NSpace, NTooltip, NButton, NIcon } from 'naive-ui' import { EditOutlined, PlayCircleOutlined } from '@vicons/antd' import type { TaskGroupQueueIdReq, - TaskGroupQueuePriorityUpdateReq, TaskGroupQueue } from '@/service/modules/task-group/types' import { forceStartTaskInQueue } from '@/service/modules/task-group' diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx index 1cef230de..f3022c991 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx @@ -60,14 +60,6 @@ const taskGroupQueue = defineComponent({ priority: 0 }) - const requestData = () => { - getTableData({ - pageSize: variables.pageSize, - pageNo: variables.page, - groupId: variables.groupId - }) - } - const resetTableData = () => { getTableData({ pageSize: variables.pageSize, @@ -120,7 +112,10 @@ const taskGroupQueue = defineComponent({ if (!searchParamRef.groupId) { searchParamRef.groupId = item.id } - let option: SelectMixedOption = { label: item.name, value: item.id } + const option: SelectMixedOption = { + label: item.name, + value: item.id + } taskGroupOptions.value.push(option) }) } diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-form.ts b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-form.ts index 5fd609788..cf670283c 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-form.ts +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-form.ts @@ -19,7 +19,6 @@ import { useI18n } from 'vue-i18n' import { reactive, ref } from 'vue' import type { FormRules } from 'naive-ui' import type { TaskGroupQueuePriorityUpdateReq } from '@/service/modules/task-group/types' -import _ from 'lodash' export function useForm() { const { t } = useI18n() @@ -35,7 +34,7 @@ export function useForm() { required: true, trigger: ['input', 'blur'], validator() { - let value = state.formData.priority + '' + const value = state.formData.priority + '' if (value && state.formData.priority >= 0) { } else { return new Error(t('resource.task_group_queue.priority_not_empty')) diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts index ee7e566a9..20b7ac9f3 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts @@ -15,12 +15,9 @@ * limitations under the License. */ -import { useAsyncState, useAsyncQueue } from '@vueuse/core' import { h, reactive, ref } from 'vue' import { useI18n } from 'vue-i18n' import { parseISO, format } from 'date-fns' -import { useRouter } from 'vue-router' -import type { Router } from 'vue-router' import type { TableColumns } from 'naive-ui/es/data-table/src/interface' import { queryTaskGroupListPaging, @@ -30,14 +27,13 @@ import TableAction from './components/table-action' import _ from 'lodash' export function useTable( - updatePriority = (queueId: number, priority: number): void => {}, + updatePriority = (unusedQueueId: number, unusedPriority: number): void => {}, resetTableData = () => {} ) { const { t } = useI18n() - const router: Router = useRouter() const columns: TableColumns = [ - { title: '#', key: 'index',render: (row, index) => index + 1 }, + { title: '#', key: 'index', render: (row, index) => index + 1 }, { title: t('resource.task_group_queue.project_name'), key: 'projectName' }, { title: t('resource.task_group_queue.task_name'), key: 'taskName' }, { @@ -97,10 +93,10 @@ export function useTable( const taskGroupList = values[1].totalList variables.totalPage = values[0].totalPage variables.tableData = values[0].totalList.map( - (item: any, index: number) => { + (item: any, unused: number) => { let taskGroupName = '' if (taskGroupList) { - let taskGroup = _.find(taskGroupList, { id: item.groupId }) + const taskGroup = _.find(taskGroupList, { id: item.groupId }) if (taskGroup) { taskGroupName = taskGroup.name } diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts index 3051e74b9..649699c2c 100644 --- a/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts @@ -81,7 +81,8 @@ export function useTable() { } }, { - icon: () => h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('security.alarm_group.edit') @@ -109,7 +110,10 @@ export function useTable() { size: 'small' }, { - icon: () => h(NIcon, null, { default: () => h(DeleteOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) } ), default: () => t('security.alarm_group.delete') @@ -153,7 +157,7 @@ export function useTable() { const getTableData = (params: any) => { const { state } = useAsyncState( queryAlertGroupListPaging({ ...params }).then((res: AlarmGroupRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { item.createTime = format( parseISO(item.createTime), 'yyyy-MM-dd HH:mm:ss' diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts index a5cc9c2fd..15a867868 100644 --- a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts +++ b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts @@ -50,7 +50,7 @@ export function useColumns(onCallback: Function) { title: t('security.alarm_instance.operation'), key: 'operation', width: 150, - render: (rowData, rowIndex) => { + render: (rowData, unused) => { return h(NSpace, null, { default: () => [ h( diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-table.ts index ea760f3b0..ad8480cd3 100644 --- a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-table.ts @@ -73,7 +73,7 @@ export function useTable() { const deleteRecord = async (id: number) => { try { - const res = await deleteAlertPluginInstance(id) + const ignored = await deleteAlertPluginInstance(id) updateList() } catch (e) { window.$message.error((e as Error).message) diff --git a/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts index b530bcba9..d49c0db75 100644 --- a/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts @@ -105,7 +105,8 @@ export function useTable() { } }, { - icon: () => h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('security.environment.edit') @@ -134,7 +135,10 @@ export function useTable() { class: 'delete' }, { - icon: () => h(NIcon, null, { default: () => h(DeleteOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) } ), default: () => t('security.environment.delete') @@ -178,7 +182,7 @@ export function useTable() { const getTableData = (params: any) => { const { state } = useAsyncState( queryEnvironmentListPaging({ ...params }).then((res: EnvironmentRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { item.createTime = format( parseISO(item.createTime), 'yyyy-MM-dd HH:mm:ss' diff --git a/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/components/use-modal.ts b/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/components/use-modal.ts index 26206d82e..50bfebf93 100644 --- a/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/components/use-modal.ts +++ b/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/components/use-modal.ts @@ -87,9 +87,11 @@ export function useModal( } const updateK8SNamespaceModal = () => { - updateK8sNamespace(variables.model, variables.model.id).then((res: any) => { - ctx.emit('confirmModal', props.showModalRef) - }) + updateK8sNamespace(variables.model, variables.model.id).then( + (ignored: any) => { + ctx.emit('confirmModal', props.showModalRef) + } + ) } return { diff --git a/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts index b47c8e848..b2cf4b7e9 100644 --- a/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts @@ -113,7 +113,8 @@ export function useTable() { } }, { - icon: () => h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('security.k8s_namespace.edit') @@ -141,7 +142,10 @@ export function useTable() { size: 'small' }, { - icon: () => h(NIcon, null, { default: () => h(DeleteOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) } ), default: () => t('security.k8s_namespace.delete') @@ -172,7 +176,7 @@ export function useTable() { const getTableData = (params: any) => { const { state } = useAsyncState( queryNamespaceListPaging({ ...params }).then((res: NamespaceListRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { item.createTime = format( parseISO(item.createTime), 'yyyy-MM-dd HH:mm:ss' diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx index 68b040e1b..b5646fb81 100644 --- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx @@ -15,7 +15,7 @@ * limitations under the License. */ -import { defineComponent, onMounted, PropType, toRefs, watch } from 'vue' +import { defineComponent, PropType, toRefs, watch } from 'vue' import Modal from '@/components/modal' import { NForm, NFormItem, NInput, NSelect } from 'naive-ui' import { useModalData } from './use-modalData' diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts index 0f1979ea7..05e51010a 100644 --- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts +++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts @@ -76,19 +76,19 @@ export function useModalData( const submitTenantModal = () => { verifyTenantCode({ tenantCode: variables.model.tenantCode }).then( - (res: any) => { + (unused: any) => { const data = { tenantCode: variables.model.tenantCode, queueId: variables.model.queueId, description: variables.model.description } createTenant(data).then( - (res: any) => { + (unused: any) => { variables.model.tenantCode = '' variables.model.description = '' ctx.emit('confirmModal', props.showModalRef) }, - (err: any) => { + (unused: any) => { return } ) @@ -103,7 +103,7 @@ export function useModalData( description: variables.model.description, id: variables.model.id } - updateTenant(data, { id: variables.model.id }).then((res: any) => { + updateTenant(data, { id: variables.model.id }).then((unused: any) => { ctx.emit('confirmModal', props.showModalRef) }) } diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts index 57d10c97d..e060752e7 100644 --- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts @@ -98,7 +98,8 @@ export function useTable() { } }, { - icon: () => h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('security.tenant.edit') @@ -127,7 +128,10 @@ export function useTable() { class: 'delete' }, { - icon: () => h(NIcon, null, { default: () => h(DeleteOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) } ), default: () => t('security.tenant.delete') @@ -158,7 +162,7 @@ export function useTable() { const getTableData = (params: any) => { const { state } = useAsyncState( queryTenantListPaging({ ...params }).then((res: any) => { - variables.tableData = res.totalList.map((item: any, index: number) => { + variables.tableData = res.totalList.map((item: any, unused: number) => { return { ...item } diff --git a/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts b/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts index 2249635e6..f2d860dc0 100644 --- a/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts +++ b/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts @@ -20,14 +20,12 @@ import { useI18n } from 'vue-i18n' import { useUserStore } from '@/store/user/user' import { useAsyncState } from '@vueuse/core' import { format } from 'date-fns' -import { queryAlertPluginInstanceList } from '@/service/modules/alert-plugin' import { listAll } from '@/service/modules/users' import { generateToken, createToken, updateToken } from '@/service/modules/token' -import type { AlertPluginItem } from '@/service/modules/alert-plugin/types' import type { UserListRes } from '@/service/modules/users/types' import type { UserInfoRes } from '@/service/modules/users/types' diff --git a/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts index feca523b1..e455bc2e2 100644 --- a/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts @@ -20,13 +20,8 @@ import { reactive, h, ref } from 'vue' import { parseISO, format } from 'date-fns' import { NButton, NIcon, NPopconfirm, NSpace, NTooltip } from 'naive-ui' import { useI18n } from 'vue-i18n' -import { - queryAlertGroupListPaging, - delAlertGroupById -} from '@/service/modules/alert-group' import { DeleteOutlined, EditOutlined } from '@vicons/antd' import { queryAccessTokenList, deleteToken } from '@/service/modules/token' -import type { AlarmGroupRes } from '@/service/modules/alert-group/types' import type { TokenRes } from '@/service/modules/token/types' export function useTable() { @@ -90,7 +85,8 @@ export function useTable() { } }, { - icon: () => h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('security.token.edit') @@ -119,7 +115,10 @@ export function useTable() { class: 'delete' }, { - icon: () => h(NIcon, null, { default: () => h(DeleteOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) } ), default: () => t('security.token.delete') @@ -163,7 +162,7 @@ export function useTable() { const getTableData = (params: any) => { const { state } = useAsyncState( queryAccessTokenList({ ...params }).then((res: TokenRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { item.expireTime = format( parseISO(item.expireTime), 'yyyy-MM-dd HH:mm:ss' diff --git a/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx b/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx index d8c46c68b..903468e38 100644 --- a/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx +++ b/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx @@ -61,7 +61,7 @@ function useColumns({ onEdit, onDelete }: UseTableProps) { { title: t('security.user.state'), key: 'state', - render: (rowData: any, rowIndex: number) => { + render: (rowData: any, unused: number) => { return rowData.state === 1 ? ( {t('security.user.state_enabled')} ) : ( @@ -84,7 +84,7 @@ function useColumns({ onEdit, onDelete }: UseTableProps) { key: 'operation', fixed: 'right', width: 140, - render: (rowData: any, rowIndex: number) => { + render: (rowData: any, unused: number) => { return ( h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('security.worker_group.edit') @@ -131,7 +132,10 @@ export function useTable() { class: 'delete' }, { - icon: () => h(NIcon, null, { default: () => h(DeleteOutlined) }) + icon: () => + h(NIcon, null, { + default: () => h(DeleteOutlined) + }) } ), default: () => t('security.worker_group.delete') @@ -175,7 +179,7 @@ export function useTable() { const getTableData = (params: any) => { const { state } = useAsyncState( queryAllWorkerGroupsPaging({ ...params }).then((res: WorkerGroupRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { return { ...item } diff --git a/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/components/use-modal.ts b/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/components/use-modal.ts index 4f128436c..9e30a1d14 100644 --- a/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/components/use-modal.ts +++ b/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/components/use-modal.ts @@ -76,7 +76,7 @@ export function useModal( const updateYarnQueueModal = () => { updateQueue({ ...variables.model }, { id: variables.model.id }).then( - (res: any) => { + (ignored: any) => { ctx.emit('confirmModal', props.showModalRef) } ) diff --git a/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts index 332672591..d801b471f 100644 --- a/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts @@ -77,7 +77,8 @@ export function useTable() { } }, { - icon: () => h(NIcon, null, { default: () => h(EditOutlined) }) + icon: () => + h(NIcon, null, { default: () => h(EditOutlined) }) } ), default: () => t('security.yarn_queue.edit') @@ -103,7 +104,7 @@ export function useTable() { const getTableData = (params: any) => { const { state } = useAsyncState( queryQueueListPaging({ ...params }).then((res: QueueRes) => { - variables.tableData = res.totalList.map((item, index) => { + variables.tableData = res.totalList.map((item, unused) => { return { ...item }