From 7382284b7d6095ad445a77e81381c1347ba61096 Mon Sep 17 00:00:00 2001 From: labbomb <739955946@qq.com> Date: Sun, 24 Apr 2022 17:46:47 +0800 Subject: [PATCH] [Feature]The utils configuration files are centrally managed under common (#9706) --- .../src/{utils => common}/column-width-config.ts | 0 dolphinscheduler-ui-next/src/{utils => common}/common.ts | 0 dolphinscheduler-ui-next/src/{utils => common}/timezone.ts | 0 dolphinscheduler-ui-next/src/{utils => common}/types.ts | 0 .../src/layouts/content/use-dataList.ts | 2 +- .../src/service/modules/process-instances/types.ts | 2 +- dolphinscheduler-ui-next/src/store/timezone/types.ts | 2 +- .../src/views/data-quality/rule/use-table.ts | 2 +- .../src/views/data-quality/task-result/use-table.ts | 4 ++-- .../src/views/datasource/list/use-columns.ts | 2 +- .../src/views/monitor/statistics/audit-log/use-table.ts | 2 +- .../src/views/projects/list/use-table.ts | 4 ++-- .../projects/task/components/node/fields/use-dependent.ts | 2 +- .../src/views/projects/task/components/node/types.ts | 2 +- .../src/views/projects/task/definition/use-table.ts | 2 +- .../src/views/projects/task/instance/index.tsx | 2 +- .../src/views/projects/task/instance/types.ts | 2 +- .../src/views/projects/task/instance/use-table.ts | 4 ++-- .../projects/workflow/components/dag/dag-context-menu.tsx | 2 +- .../projects/workflow/components/dag/dag-startup-param.tsx | 2 +- .../src/views/projects/workflow/components/dag/types.ts | 2 +- .../projects/workflow/components/dag/use-node-status.ts | 2 +- .../workflow/definition/components/timing-modal.tsx | 2 +- .../projects/workflow/definition/components/use-modal.ts | 2 +- .../views/projects/workflow/definition/timing/use-table.ts | 2 +- .../src/views/projects/workflow/definition/tree/index.tsx | 2 +- .../src/views/projects/workflow/definition/use-table.ts | 2 +- .../instance/components/process-instance-condition.tsx | 2 +- .../workflow/instance/gantt/components/gantt-chart.tsx | 4 ++-- .../src/views/projects/workflow/instance/gantt/type.ts | 2 +- .../src/views/projects/workflow/instance/use-table.ts | 6 +++--- .../src/views/resource/file/create/index.tsx | 2 +- .../src/views/resource/file/table/table-action.tsx | 2 +- .../src/views/resource/file/table/use-table.ts | 4 ++-- .../src/views/resource/task-group/option/use-table.ts | 4 ++-- .../src/views/resource/task-group/queue/use-table.ts | 4 ++-- .../src/views/resource/udf/function/use-table.ts | 2 +- .../src/views/resource/udf/resource/use-table.ts | 4 ++-- .../src/views/security/alarm-group-manage/use-table.ts | 2 +- .../src/views/security/alarm-instance-manage/use-table.ts | 2 +- .../src/views/security/environment-manage/use-table.ts | 4 ++-- .../src/views/security/k8s-namespace-manage/use-table.ts | 4 ++-- .../src/views/security/tenant-manage/use-table.ts | 2 +- .../src/views/security/token-manage/use-table.ts | 2 +- .../src/views/security/user-manage/use-columns.ts | 2 +- .../src/views/security/user-manage/use-table.ts | 2 +- 46 files changed, 54 insertions(+), 54 deletions(-) rename dolphinscheduler-ui-next/src/{utils => common}/column-width-config.ts (100%) rename dolphinscheduler-ui-next/src/{utils => common}/common.ts (100%) rename dolphinscheduler-ui-next/src/{utils => common}/timezone.ts (100%) rename dolphinscheduler-ui-next/src/{utils => common}/types.ts (100%) diff --git a/dolphinscheduler-ui-next/src/utils/column-width-config.ts b/dolphinscheduler-ui-next/src/common/column-width-config.ts similarity index 100% rename from dolphinscheduler-ui-next/src/utils/column-width-config.ts rename to dolphinscheduler-ui-next/src/common/column-width-config.ts diff --git a/dolphinscheduler-ui-next/src/utils/common.ts b/dolphinscheduler-ui-next/src/common/common.ts similarity index 100% rename from dolphinscheduler-ui-next/src/utils/common.ts rename to dolphinscheduler-ui-next/src/common/common.ts diff --git a/dolphinscheduler-ui-next/src/utils/timezone.ts b/dolphinscheduler-ui-next/src/common/timezone.ts similarity index 100% rename from dolphinscheduler-ui-next/src/utils/timezone.ts rename to dolphinscheduler-ui-next/src/common/timezone.ts diff --git a/dolphinscheduler-ui-next/src/utils/types.ts b/dolphinscheduler-ui-next/src/common/types.ts similarity index 100% rename from dolphinscheduler-ui-next/src/utils/types.ts rename to dolphinscheduler-ui-next/src/common/types.ts diff --git a/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts b/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts index e2d8d084fe..242edd414a 100644 --- a/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts +++ b/dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts @@ -50,7 +50,7 @@ import { } from '@vicons/antd' import { useRoute } from 'vue-router' import { useUserStore } from '@/store/user/user' -import { timezoneList } from '@/utils/timezone' +import { timezoneList } from '@/common/timezone' import type { UserInfoRes } from '@/service/modules/users/types' export function useDataList() { diff --git a/dolphinscheduler-ui-next/src/service/modules/process-instances/types.ts b/dolphinscheduler-ui-next/src/service/modules/process-instances/types.ts index 2b32b1501c..adbafb915c 100644 --- a/dolphinscheduler-ui-next/src/service/modules/process-instances/types.ts +++ b/dolphinscheduler-ui-next/src/service/modules/process-instances/types.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { ITaskState } from '@/utils/types' +import type { ITaskState } from '@/common/types' interface CodeReq { projectCode: number diff --git a/dolphinscheduler-ui-next/src/store/timezone/types.ts b/dolphinscheduler-ui-next/src/store/timezone/types.ts index 558a779ba8..b79d4afd1b 100644 --- a/dolphinscheduler-ui-next/src/store/timezone/types.ts +++ b/dolphinscheduler-ui-next/src/store/timezone/types.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { timezoneList } from '@/utils/timezone' +import { timezoneList } from '@/common/timezone' type Timezone = typeof timezoneList[number] 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 a8ff4b3e4c..fbc10a7b7b 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 @@ -24,7 +24,7 @@ import TableAction from './components/table-action' import _ from 'lodash' import { format } from 'date-fns' import { TableColumns } from 'naive-ui/es/data-table/src/interface' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' export function useTable(viewRuleEntry = (unusedRuleJson: string): void => {}) { const { t } = useI18n() 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 50991c7501..cfcb380836 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 @@ -24,12 +24,12 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { ResultItem, ResultListRes } from '@/service/modules/data-quality/types' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' export function useTable() { const { t } = useI18n() 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 e376b6b183..2f3682a710 100644 --- a/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts +++ b/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts @@ -32,7 +32,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { TableColumns } from './types' export function useColumns(onCallback: Function) { 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 a1871e2b3a..f45b2ee3dc 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 @@ -20,7 +20,7 @@ import { reactive, ref } from 'vue' import { useAsyncState } from '@vueuse/core' import { queryAuditLogListPaging } from '@/service/modules/audit' import { format } from 'date-fns' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import type { AuditListRes } from '@/service/modules/audit/types' export function useTable() { 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 4ee5727b04..c6e6f8b62c 100644 --- a/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts @@ -20,7 +20,7 @@ import { useI18n } from 'vue-i18n' import { useAsyncState } from '@vueuse/core' import ButtonLink from '@/components/button-link' import { queryProjectListPaging } from '@/service/modules/projects' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import { deleteProject } from '@/service/modules/projects' import { format } from 'date-fns' import { useRouter } from 'vue-router' @@ -36,7 +36,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { Router } from 'vue-router' import type { ProjectRes } from '@/service/modules/projects/types' import { DeleteOutlined, EditOutlined } from '@vicons/antd' 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 220489dce5..6f03339eb4 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 @@ -21,7 +21,7 @@ import { NIcon } from 'naive-ui' import { useRelationCustomParams, useDependentTimeout } from '.' import { useTaskNodeStore } from '@/store/project/task-node' import { queryAllProjectList } from '@/service/modules/projects' -import { tasksState } from '@/utils/common' +import { tasksState } from '@/common/common' import { queryProcessDefinitionList, getTasksByDefinitionList diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts index 70121e650c..8001373695 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts @@ -31,7 +31,7 @@ export type { WorkflowInstance } from '@/views/projects/workflow/components/dag/types' export type { IResource, ProgramType, IMainJar } from '@/store/project/types' -export type { ITaskState } from '@/utils/types' +export type { ITaskState } from '@/common/types' type SourceType = 'MYSQL' | 'HDFS' | 'HIVE' type ModelType = 'import' | 'export' 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 3fbb755a8e..ceafe9a45c 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 @@ -35,7 +35,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { TaskDefinitionItem, TaskDefinitionRes diff --git a/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx b/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx index e1d1e27e04..9faa15f3f9 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx @@ -34,7 +34,7 @@ import Card from '@/components/card' import LogModal from '@/components/log-modal' import { useAsyncState } from '@vueuse/core' import { queryLog } from '@/service/modules/log' -import { stateType } from '@/utils/common' +import { stateType } from '@/common/common' import styles from './index.module.scss' const TaskInstance = defineComponent({ diff --git a/dolphinscheduler-ui-next/src/views/projects/task/instance/types.ts b/dolphinscheduler-ui-next/src/views/projects/task/instance/types.ts index 5e58245cbf..12c6a18098 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/instance/types.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/instance/types.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ITaskState } from '@/utils/types' +import { ITaskState } from '@/common/types' export type { Router } from 'vue-router' export type { TaskInstancesRes } from '@/service/modules/task-instances/types' 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 097763fbe3..4d526f2a16 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 @@ -32,12 +32,12 @@ import { } from '@vicons/antd' import { format } from 'date-fns' import { useRoute, useRouter } from 'vue-router' -import { parseTime, tasksState } from '@/utils/common' +import { parseTime, tasksState } from '@/common/common' import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { Router, TaskInstancesRes, IRecord, ITaskState } from './types' export function useTable() { diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-context-menu.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-context-menu.tsx index 435a7b876d..30eaee9cdf 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-context-menu.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-context-menu.tsx @@ -21,7 +21,7 @@ import { defineComponent, onMounted, PropType, inject, ref } from 'vue' import { useI18n } from 'vue-i18n' import { useRoute } from 'vue-router' import styles from './menu.module.scss' -import { uuid } from '@/utils/common' +import { uuid } from '@/common/common' import { IWorkflowTaskInstance } from './types' const props = { diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-startup-param.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-startup-param.tsx index da569e48bb..56195ec01e 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-startup-param.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-startup-param.tsx @@ -20,7 +20,7 @@ import { defineComponent, onMounted, PropType, ref, computed } from 'vue' import { useI18n } from 'vue-i18n' import { listAlertGroupById } from '@/service/modules/alert-group' import { queryAllWorkerGroups } from '@/service/modules/worker-groups' -import { runningType, warningTypeList } from '@/utils/common' +import { runningType, warningTypeList } from '@/common/common' import { IStartupParam } from './types' import styles from './startup.module.scss' diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/types.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/types.ts index 7eba74cfd8..f76a045f52 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/types.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/types.ts @@ -16,7 +16,7 @@ */ import { TaskType } from '@/views/projects/task/constants/task-type' -export type { ITaskState } from '@/utils/types' +export type { ITaskState } from '@/common/types' export interface ProcessDefinition { id: number diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-node-status.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-node-status.ts index 68148a71eb..058fa770d9 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-node-status.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-node-status.ts @@ -18,7 +18,7 @@ import { render, h, ref } from 'vue' import { useRoute } from 'vue-router' import { useI18n } from 'vue-i18n' -import { tasksState } from '@/utils/common' +import { tasksState } from '@/common/common' import { NODE, NODE_STATUS_MARKUP } from './dag-config' import { queryTaskListByProcessId } from '@/service/modules/process-instances' import NodeStatus from '@/views/projects/workflow/components/dag/dag-node-status' diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx index b8eb9e2717..786dad87b6 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx @@ -47,7 +47,7 @@ import { NPopover } from 'naive-ui' import { ArrowDownOutlined, ArrowUpOutlined } from '@vicons/antd' -import { timezoneList } from '@/utils/timezone' +import { timezoneList } from '@/common/timezone' import Crontab from '@/components/crontab' const props = { diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-modal.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-modal.ts index 7020687456..2a1fd724b3 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-modal.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-modal.ts @@ -35,7 +35,7 @@ import { updateSchedule, previewSchedule } from '@/service/modules/schedules' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import { EnvironmentItem } from '@/service/modules/environment/types' import { ITimingState } from './types' diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts index a77906e86e..5219a21af4 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts @@ -35,7 +35,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import { format } from 'date-fns-tz' import { ISearchParam } from './types' import styles from '../index.module.scss' diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/tree/index.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/tree/index.tsx index 3a3f41a1d4..0856c60953 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/tree/index.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/tree/index.tsx @@ -27,7 +27,7 @@ import { Router, useRouter } from 'vue-router' import { viewTree } from '@/service/modules/process-definition' import { SelectMixedOption } from 'naive-ui/lib/select/src/interface' import { find } from 'lodash' -import { tasksState } from '@/utils/common' +import { tasksState } from '@/common/common' import type { ITaskTypeNodeOption } from './types' export default defineComponent({ diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts index 1331e67d5d..3bc68ba546 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts @@ -38,7 +38,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { IDefinitionParam } from './types' import type { Router } from 'vue-router' import type { TableColumns, RowKey } from 'naive-ui/es/data-table/src/interface' diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/process-instance-condition.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/process-instance-condition.tsx index 09a3b0f53e..e41533df77 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/process-instance-condition.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/process-instance-condition.tsx @@ -28,7 +28,7 @@ import { import { defineComponent, ref } from 'vue' import { useI18n } from 'vue-i18n' import { format } from 'date-fns' -import { stateType } from '@/utils/common' +import { stateType } from '@/common/common' export default defineComponent({ name: 'ProcessInstanceCondition', diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/components/gantt-chart.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/components/gantt-chart.tsx index 3529f708c6..36b72daaf6 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/components/gantt-chart.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/components/gantt-chart.tsx @@ -20,9 +20,9 @@ import * as echarts from 'echarts' import type { Ref } from 'vue' import { useI18n } from 'vue-i18n' import initChart from '@/components/chart' -import { tasksState } from '@/utils/common' +import { tasksState } from '@/common/common' import { format } from 'date-fns' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import type { ISeriesData, ITaskState } from '../type' const props = { diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/type.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/type.ts index 47a756bfbc..1a9cc9d791 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/type.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/gantt/type.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ITaskState } from '@/utils/types' +import { ITaskState } from '@/common/types' interface ITask { taskName: string diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts index 6a212a0128..9bc0a566e6 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts @@ -29,15 +29,15 @@ import { } from '@/service/modules/process-instances' import { execute } from '@/service/modules/executors' import TableAction from './components/table-action' -import { runningType } from '@/utils/common' -import { parseTime } from '@/utils/common' +import { runningType } from '@/common/common' +import { parseTime } from '@/common/common' import styles from './index.module.scss' import { renderStateCell } from '../../task/instance/use-table' import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { Router } from 'vue-router' import type { IWorkflowInstance } from '@/service/modules/process-instances/types' import type { ICountDownParam } from './types' diff --git a/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx b/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx index 31e8453683..fdff756bff 100644 --- a/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx +++ b/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx @@ -24,7 +24,7 @@ import Card from '@/components/card' import MonacoEditor from '@/components/monaco-editor' import { useCreate } from './use-create' import { useForm } from './use-form' -import { fileTypeArr } from '@/utils/common' +import { fileTypeArr } from '@/common/common' import styles from '../index.module.scss' diff --git a/dolphinscheduler-ui-next/src/views/resource/file/table/table-action.tsx b/dolphinscheduler-ui-next/src/views/resource/file/table/table-action.tsx index b3eda7835e..e224e27645 100644 --- a/dolphinscheduler-ui-next/src/views/resource/file/table/table-action.tsx +++ b/dolphinscheduler-ui-next/src/views/resource/file/table/table-action.tsx @@ -28,7 +28,7 @@ import { import _ from 'lodash' import { useI18n } from 'vue-i18n' import { ResourceFileTableData } from '../types' -import { fileTypeArr } from '@/utils/common' +import { fileTypeArr } from '@/common/common' import { downloadResource, deleteResource } from '@/service/modules/resources' import { IRenameFile, IRtDisb } from '../types' import type { Router } from 'vue-router' diff --git a/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts index 62fb3294a3..7cb934ac28 100644 --- a/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts @@ -18,7 +18,7 @@ import { h } from 'vue' import { useI18n } from 'vue-i18n' import { useRouter } from 'vue-router' -import { bytesToSize } from '@/utils/common' +import { bytesToSize } from '@/common/common' import { useFileStore } from '@/store/file/file' import TableAction from './table-action' import { IRenameFile } from '../types' @@ -27,7 +27,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { Router } from 'vue-router' import type { TableColumns } from 'naive-ui/es/data-table/src/interface' 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 93f63cad68..e4ffd0f44c 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 @@ -22,12 +22,12 @@ import { queryTaskGroupListPaging } from '@/service/modules/task-group' import { queryAllProjectList } from '@/service/modules/projects' import TableAction from './components/table-action' import _ from 'lodash' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { TableColumns } from 'naive-ui/es/data-table/src/interface' export function useTable( 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 8a532656d9..4aa7028806 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 @@ -29,8 +29,8 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' -import { parseTime } from '@/utils/common' +} from '@/common/column-width-config' +import { parseTime } from '@/common/common' export function useTable( updatePriority = (unusedQueueId: number, unusedPriority: number): void => {}, diff --git a/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts index 5dfa9003c9..cf4a0407bb 100644 --- a/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts @@ -31,7 +31,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { IUdfFunctionParam } from './types' export function useTable() { diff --git a/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts index 916cf5e4e2..70afedc48b 100644 --- a/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts @@ -18,7 +18,7 @@ import { h, ref, reactive } from 'vue' import { useI18n } from 'vue-i18n' import { useRouter } from 'vue-router' -import { bytesToSize } from '@/utils/common' +import { bytesToSize } from '@/common/common' import { useFileStore } from '@/store/file/file' import type { Router } from 'vue-router' import type { TableColumns } from 'naive-ui/es/data-table/src/interface' @@ -36,7 +36,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { IUdfResourceParam } from './types' const goSubFolder = (router: Router, item: any) => { 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 be5e7ede90..e15b50f25b 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 @@ -25,7 +25,7 @@ import { delAlertGroupById } from '@/service/modules/alert-group' import { DeleteOutlined, EditOutlined } from '@vicons/antd' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import type { AlarmGroupRes } from '@/service/modules/alert-group/types' export function useTable() { 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 70a6ea89ba..43ebebc5b7 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 @@ -21,7 +21,7 @@ import { deleteAlertPluginInstance } from '@/service/modules/alert-plugin' import { format } from 'date-fns' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import type { IRecord } from './types' export function useTable() { 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 115341e8ab..2ebbfaf52d 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 @@ -29,12 +29,12 @@ import type { EnvironmentRes, EnvironmentItem } from '@/service/modules/environment/types' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' export function useTable() { const { t } = useI18n() 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 4132d6b3b4..6ed8bdd283 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 @@ -29,12 +29,12 @@ import type { NamespaceListRes, NamespaceItem } from '@/service/modules/k8s-namespace/types' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' export function useTable() { const { t } = useI18n() 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 a3fc2d7855..daad3102cf 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 @@ -28,7 +28,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' export function useTable() { const { t } = useI18n() 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 ccc1a5c8b1..37f75bb9e8 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 @@ -22,7 +22,7 @@ import { NButton, NIcon, NPopconfirm, NSpace, NTooltip } from 'naive-ui' import { useI18n } from 'vue-i18n' import { DeleteOutlined, EditOutlined } from '@vicons/antd' import { queryAccessTokenList, deleteToken } from '@/service/modules/token' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import type { TokenRes } from '@/service/modules/token/types' export function useTable() { diff --git a/dolphinscheduler-ui-next/src/views/security/user-manage/use-columns.ts b/dolphinscheduler-ui-next/src/views/security/user-manage/use-columns.ts index f0af7aec9c..5e77865f73 100644 --- a/dolphinscheduler-ui-next/src/views/security/user-manage/use-columns.ts +++ b/dolphinscheduler-ui-next/src/views/security/user-manage/use-columns.ts @@ -31,7 +31,7 @@ import { COLUMN_WIDTH_CONFIG, calculateTableWidth, DefaultTableWidth -} from '@/utils/column-width-config' +} from '@/common/column-width-config' import type { TableColumns, InternalRowData } from './types' export function useColumns(onCallback: Function) { diff --git a/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.ts index 1e0c9a39dc..958eff66f4 100644 --- a/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.ts @@ -18,7 +18,7 @@ import { reactive, onMounted } from 'vue' import { queryUserList, delUserById } from '@/service/modules/users' import { format } from 'date-fns' -import { parseTime } from '@/utils/common' +import { parseTime } from '@/common/common' import type { IRecord, TAuthType } from './types' export function useTable() {