Skip to content

B
bigDataSystem
Commit 9db00b63 authored by chenjiahao's avatar chenjiahao
Browse files
Options

Shell开发-修改已知问题

parent cb1a14ba
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 284 deletions
src/views/scriptDevelopment/shellDevelopment/addFile/tempalte.data.ts
View file @ 9db00b63
......@@ -162,7 +162,7 @@ export const formSchemaTemplate: any = [
field: 'fileType',
label: '文件类型',
component: 'Input',
defaultValue: '.sh格式文件',
defaultValue: 'Shell',
colProps: { span: 8 },
componentProps: {
readonly: true,
......@@ -190,14 +190,15 @@ export const formSchemaTemplate: any = [
{
field: 'model',
label: '目录权属模式',
component: 'RadioGroup',
defaultValue: '本级定义',
component: 'Input',
defaultValue: '资源自定义',
colProps: { span: 8 },
componentProps: {
options: [
{ label: '本级定义', value: '本级定义' },
{ label: '资源自定义', value: '资源自定义' },
],
readonly: true,
style: {
border: 'none',
backgroundColor: 'transparent',
},
},
},
{
......
src/views/scriptDevelopment/shellDevelopment/addFile/templateModal.vue
View file @ 9db00b63
......@@ -44,6 +44,7 @@
//初始化表单
const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
labelWidth: 100,
labelAlign: 'left',
baseColProps: { lg: 24, md: 24 },
schemas: formSchemaTemplate,
showActionButtonGroup: false,
......
src/views/scriptDevelopment/shellDevelopment/shellExecute/VersionDetail.vue
View file @ 9db00b63
<template>
<PageWrapper
title="shell文件查看详情"
dense
contentFullHeight
fixedHeight
contentClass="flex"
@back="goBack"
>
<!-- <GroupTree @select="handleSelect" class="w-1/4 xl:w-1/5" /> -->
<div class="w-full xl:w-full" style="padding-top: 20px">
<BasicForm @register="registerForm">
<template #formFooter>
<div style="display: flex; justify-content: space-between; margin-left: 500px">
<!-- 新窗口运行-->
<!-- <Tooltip placement="top" title="新窗口运行">
<a-button
type="primary"
style="margin-right: 10px; margin-left: 500px"
@click="handleExecute"
>
<Icon icon="si:play-forward-duotone" :size="20" />
</a-button>
</Tooltip> -->
<!-- 运行-->
<!-- <Tooltip placement="top" title="运行">
<a-button type="primary" style="margin-right: 10px" @click="handleExecute">
<Icon icon="si:play-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- 执行记录-->
<!-- <Tooltip placement="top" title="执行记录">
<a-button type="primary" style="margin-right: 10px" @click="handleRecord">
<Icon icon="si:clock-alt-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- 提交版本-->
<!-- <Tooltip placement="top" title="提交版本">
<a-button type="primary" style="margin-right: 10px" @click="handleSubmit">
<Icon icon="majesticons:cloud-upload-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- 版本管理-->
<!-- <Tooltip placement="top" title="版本管理">
<a-button type="primary" style="margin-right: 10px" @click="handleVersion">
<Icon icon="majesticons:file-search-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- 参数配置-->
<!-- <Tooltip placement="top" title="参数配置">
<a-button type="primary" style="margin-right: 10px" @click="handleOptions">
<Icon icon="majesticons:link-circle-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- 格式化-->
<!-- <Tooltip placement="top" title="格式化">
<a-button type="primary" style="margin-right: 10px" @click="handleChange">
<Icon icon="gg:align-left" :size="20" />
</a-button>
</Tooltip> -->
<!-- 保存-->
<!-- <Tooltip placement="top" title="保存">
<a-button type="primary" style="margin-right: 10px" @click="handleSave">
<Icon icon="majesticons:save-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- <Tooltip placement="top" :title="layout === 'single' ? '版本对比' : '结束对比'">
<a-button type="primary" style="margin-right: 10px" @click="toggleLayout">
<Icon
:icon="layout === 'single' ? 'majesticons:user-line' : 'majesticons:users-line'"
:size="20"
/>
</a-button>
</Tooltip> -->
<Tooltip placement="top" title="退出查看">
<a-button type="error" style="margin-right: 10px" @click="handleExit">
<Icon icon="majesticons:backspace-line" :size="20" />
</a-button>
</Tooltip>
</div>
</template>
</BasicForm>
<PageWrapper title="" dense contentFullHeight fixedHeight contentClass="flex">
<template #headerContent>
<div style="width: 100%; display: flex; align-items: center; justify-content: space-between">
<div style="display: flex; align-items: center">
<span style="color: grey; margin-left: 10px"> {{ path }}</span>
</div>
<div style="display: flex; margin-left: 500px">
<!-- 提交版本-->
<Tooltip placement="top" title="提交版本">
<a-button type="primary" style="margin-right: 10px" @click="handleSubmit">
提交版本
<!-- <Icon icon="majesticons:cloud-upload-line" :size="20" />-->
</a-button>
</Tooltip>
<!-- 版本管理-->
<Tooltip placement="top" title="版本管理">
<a-button type="primary" style="margin-right: 10px" @click="handleVersion">
版本管理
<!-- <Icon icon="majesticons:file-search-line" :size="20" />-->
</a-button>
</Tooltip>
<!-- 参数配置-->
<Tooltip placement="top" title="参数配置">
<a-button type="primary" style="margin-right: 10px" @click="handleOptions">
参数配置
<!-- <Icon icon="majesticons:link-circle-line" :size="20" />-->
</a-button>
</Tooltip>
<!-- 保存-->
<Tooltip placement="top" title="保存">
<a-button type="primary" style="margin-right: 10px" @click="handleSave">
保存
<!-- <Icon icon="majesticons:save-line" :size="20" />-->
</a-button>
</Tooltip>
</div>
</div>
<div style="display: flex; justify-content: space-between; margin-top: 10px">
<div style="display: flex; gap: 10px; align-items: center">
<span style="color: grey; margin-left: 10px">选择版本:</span>
<Select
v-model:value="optionValue"
placeholder="请选择版本"
:options="options"
@change="handleChange"
/>
</div>
<div>
<Tooltip placement="top" title="回退至该版本">
<a-button type="primary" style="margin-right: 10px" @click="handleBackToCurrent">
<Icon icon="ri:arrow-go-back-fill" :size="20" />
回退至该版本
</a-button>
</Tooltip>
<Tooltip placement="top" title="退出查看">
<a-button type="error" style="margin-right: 10px" @click="handleExit">
退出查看
<!-- <Icon icon="majesticons:backspace-line" :size="20" />-->
</a-button>
</Tooltip>
</div>
</div>
</template>
<div class="w-full xl:w-full" style="background-color: white">
<div style="width: 100%; margin-top: 20px">
<div class="editor-container">
<div>
<CodeEditor v-model:value="jsonData" :mode="MODE.JSON" />
</div>
<div class="codeEditorH" style="padding: 0 15px" v-if="layout === 'single'">
<CodeEditor v-model:value="jsonData" :mode="MODE.SHELL" />
</div>
</div>
</div>
<optionsModal @register="registerModal" />
<OptionsModal @register="registerModal" />
<resultModal @register="registerResultModal" />
<PreviewModal @register="registerPreviewModal" />
<RecordModal @register="registerRecordModal" />
......@@ -105,16 +78,16 @@
</PageWrapper>
</template>
<script lang="ts" setup>
import { Modal, Tooltip } from 'ant-design-vue';
import { Modal, Tooltip, Select } from 'ant-design-vue';
import { onMounted, ref, nextTick, watch } from 'vue';
import { PageWrapper } from '@/components/Page';
import GroupTree from '../GroupTree.vue';
import { jsonData } from '../sqlDevelopmentData';
import { DataTreeData, jsonData } from '../sqlDevelopmentData';
import { CompareFormSchema } from '../data';
import { useGo } from '@/hooks/web/usePage';
import { CodeEditor, MODE } from '@/components/CodeEditor';
import { BasicForm, useForm } from '@/components/Form';
import optionsModal from './optionsModal.vue';
import OptionsModal from './optionsModal.vue';
import { useModal } from '@/components/Modal';
import resultModal from './resultModal.vue';
import PreviewModal from './dataPreviewModal.vue';
......@@ -125,14 +98,26 @@
import { schema } from '@/views/dataIntegration/taskOM/taskOM.data';
import versionManagementModal from './versionManagementModal.vue';
import { router } from '@/router';
import { useRoute } from 'vue-router';
defineOptions({ name: 'AccountManagement' });
const { createMessage } = useMessage();
const go = useGo();
const path = ref('');
const optionValue = ref('V1 2022/01/01 12:24:22');
const options = ref([
{
label: 'V1 2022/01/01 12:24:22',
value: 'V1 2022/01/01 12:24:22',
},
{
label: 'V2 2022/01/02 13:30:00',
value: 'V2 2022/01/02 13:30:00',
},
]);
const layout = ref('single');
const jsonDataLeft = jsonData;
const jsonDataRight = jsonData;
const route = useRoute();
const editorLeft = ref<HTMLElement | null>(null);
const editorRight = ref<HTMLElement | null>(null);
const toggleLayout = () => {
......@@ -144,34 +129,23 @@
const [registerPreviewModal, { openModal: openPreviewModal }] = useModal();
const [registerVersionManagementModal, { openModal: openVersionManagementModal }] = useModal();
const [registerRecordModal, { openModal: openRecordModal }] = useModal();
const [registerForm] = useForm({
labelWidth: 100,
baseColProps: { lg: 6, md: 4 },
schemas: CompareFormSchema,
showActionButtonGroup: false,
disabled: true,
});
/** 部门树的select*/
function handleSelect() {
openPreviewModal(true, {
title: '数据预览',
});
}
function handleOptions() {
openModal(true, {
title: '参数配置',
});
}
function handleExecute() {
openResultModal(true, {
title: '执行结果',
});
}
function handleRecord() {
openRecordModal(true, {
title: '执行记录',
});
// 根据id获取文件路径
function getPathById(id) {
console.log(id);
const node = DataTreeData.find((item) => '' + item.businessId === id);
console.log(node);
if (!node) return ''; // 如果找不到节点，则返回空字符串
// 如果是根节点，直接返回其名称
if (node.parentId === 0) {
return node.workSpaceName;
}
// 递归获取父节点路径，并拼接当前节点名称
const parentPath = getPathById('' + node.parentId);
console.log('parentPath', parentPath);
return `${parentPath} / ${node.workSpaceName}`;
}
//提交版本按钮
function handleSubmit() {
openSubmitModal(true, {
......@@ -183,6 +157,12 @@
function handleVersion() {
openVersionManagementModal(true, {
title: '版本管理',
id: route.query.id,
});
}
function handleOptions() {
openModal(true, {
title: '参数配置',
});
}
function handleChange() {
......@@ -194,19 +174,20 @@
}
//退出查看按钮
function handleExit() {
Modal.confirm({
iconType: 'warning',
title: '提示',
content: '是否退出查看?',
onOk() {
router.push('/scriptDevelopment/shellDevelopment/shellExecute/shellExecute');
router.back();
}
//退出查看按钮
function handleBackToCurrent() {
router.push({
path: '/scriptDevelopment/shellDevelopment/shellExecute/shellExecute',
query: {
id: route.query.id,
},
});
}
// 页面左侧点击返回链接时的操作
function goBack() {
// 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
go('/scriptDevelopment/shellDevelopment/index');
router.back();
}
//同步滚动
const handleScroll = () => {
......@@ -229,6 +210,7 @@
}
});
onMounted(async () => {
path.value = getPathById(route.query.id);
await nextTick(() => {
if (editorLeft.value && editorRight.value) {
editorLeft.value.addEventListener('scroll', handleScroll);
......@@ -237,31 +219,11 @@
});
});
</script>
<style scoped>
.editor-container {
display: flex;
}
.editor-left {
flex: 1;
height: 100%;
overflow-y: hidden;
<style lang="less" scoped>
:deep(.CodeMirror) {
height: 700px !important;
}
.editor-right {
flex: 1;
height: 100%;
overflow-y: hidden;
}
.editor-wrapper {
display: flex;
justify-content: space-between;
}
.editor-left,
.editor-right {
flex: 1;
overflow: hidden;
:deep(.ant-page-header) {
padding: 5px !important;
}
</style>
src/views/scriptDevelopment/shellDevelopment/shellExecute/optionsModal.vue
View file @ 9db00b63
<template>
<BasicModal
width="30%"
width="41%"
v-bind="$attrs"
@register="registerModal"
:title="title"
......
src/views/scriptDevelopment/shellDevelopment/shellExecute/shellExecute.vue
View file @ 9db00b63
......@@ -14,31 +14,6 @@
<span style="color: grey; margin-left: 10px"> {{ path }}</span>
</div>
<div style="display: flex; margin-left: 500px">
<!-- 新窗口运行-->
<!-- <Tooltip placement="top" title="新窗口运行">
<a-button
type="primary"
style="margin-right: 10px; margin-left: 500px"
@click="handleExecute"
>
<Icon icon="si:play-forward-duotone" :size="20" />
</a-button>
</Tooltip> -->
<!-- 运行-->
<!-- <Tooltip placement="top" title="运行">
<a-button type="primary" style="margin-right: 10px" @click="handleExecute">
<Icon icon="si:play-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- 执行记录-->
<!-- <Tooltip placement="top" title="执行记录">
<a-button type="primary" style="margin-right: 10px" @click="handleRecord">
<Icon icon="si:clock-alt-line" :size="20" />
</a-button>
</Tooltip> -->
<!-- 提交版本-->
<Tooltip placement="top" title="提交版本">
<a-button type="primary" style="margin-right: 10px" @click="handleSubmit">
......@@ -46,7 +21,6 @@
<!-- <Icon icon="majesticons:cloud-upload-line" :size="20" />-->
</a-button>
</Tooltip>
<!-- 版本管理-->
<Tooltip placement="top" title="版本管理">
<a-button type="primary" style="margin-right: 10px" @click="handleVersion">
......@@ -54,7 +28,6 @@
<!-- <Icon icon="majesticons:file-search-line" :size="20" />-->
</a-button>
</Tooltip>
<!-- 参数配置-->
<Tooltip placement="top" title="参数配置">
<a-button type="primary" style="margin-right: 10px" @click="handleOptions">
......@@ -62,15 +35,6 @@
<!-- <Icon icon="majesticons:link-circle-line" :size="20" />-->
</a-button>
</Tooltip>
<!-- 格式化-->
<!-- <Tooltip placement="top" title="格式化">-->
<!-- <a-button type="primary" style="margin-right: 10px" @click="handleChange">-->
<!-- 格式化-->
<!-- &lt;!&ndash; <Icon icon="gg:align-left" :size="20" />&ndash;&gt;-->
<!-- </a-button>-->
<!-- </Tooltip>-->
<!-- 保存-->
<Tooltip placement="top" title="保存">
<a-button type="primary" style="margin-right: 10px" @click="handleSave">
......@@ -78,15 +42,6 @@
<!-- <Icon icon="majesticons:save-line" :size="20" />-->
</a-button>
</Tooltip>
<!--
<Tooltip placement="top" :title="layout === 'single' ? '版本对比' : '结束对比'">
<a-button type="primary" style="margin-right: 10px" @click="toggleLayout">
<Icon
:icon="layout === 'single' ? 'majesticons:user-line' : 'majesticons:users-line'"
:size="20"
/>
</a-button>
</Tooltip> -->
</div>
</div>
</template>
......@@ -95,32 +50,10 @@
<div class="codeEditorH" style="padding: 0 15px" v-if="layout === 'single'">
<CodeEditor v-model:value="jsonData" :mode="MODE.SHELL" />
</div>
<div v-else class="editor-container">
<div class="editor-wrapper" style="height: 600px">
<div
class="editor-left"
ref="editorLeft"
style="flex: 1; width: 50%; overflow: hidden"
:scrollbar="false"
>
<CodeEditor v-model:value="jsonDataLeft" :mode="MODE.JSON" />
</div>
<div
class="editor-right"
ref="editorRight"
style="flex: 1; width: 50%; overflow: hidden"
:scrollbar="false"
>
<CodeEditor v-model:value="jsonDataRight" :mode="MODE.JSON" />
</div>
</div>
</div>
</div>
</div>
<OptionsModal @register="registerModal" />
<ResultModal @register="registerResultModal" />
<PreviewModal @register="registerPreviewModal" />
<RecordModal @register="registerRecordModal" />
<SubmitModal @register="registerSubmitModal" />
<VersionManagementModal @register="registerVersionManagementModal" />
</PageWrapper>
......@@ -155,8 +88,6 @@
const route = useRoute();
const path = ref('');
const layout = ref('single');
const jsonDataLeft = jsonData;
const jsonDataRight = jsonData;
const editorLeft = ref<HTMLElement | null>(null);
const editorRight = ref<HTMLElement | null>(null);
const toggleLayout = () => {
......@@ -164,16 +95,9 @@
};
const [registerModal, { openModal }] = useModal();
const [registerSubmitModal, { openModal: openSubmitModal }] = useModal();
const [registerResultModal, { openModal: openResultModal }] = useModal();
const [registerPreviewModal, { openModal: openPreviewModal }] = useModal();
const [registerVersionManagementModal, { openModal: openVersionManagementModal }] = useModal();
const [registerRecordModal, { openModal: openRecordModal }] = useModal();
const [registerForm] = useForm({
labelWidth: 100,
baseColProps: { lg: 6, md: 4 },
schemas: formSchema,
showActionButtonGroup: false,
});
/** 部门树的select*/
function handleSelect() {
openPreviewModal(true, {
......@@ -185,16 +109,7 @@
title: '参数配置',
});
}
function handleExecute() {
openResultModal(true, {
title: '执行结果',
});
}
function handleRecord() {
openRecordModal(true, {
title: '执行记录',
});
}
//提交版本按钮
function handleSubmit() {
openSubmitModal(true, {
......@@ -206,6 +121,7 @@
function handleVersion() {
openVersionManagementModal(true, {
title: '版本管理',
id: route.query.id,
});
}
function handleChange() {
......@@ -259,7 +175,6 @@
}
});
onMounted(async () => {
console.log(111111111111);
path.value = getPathById(route.query.id);
await nextTick(() => {
if (editorLeft.value && editorRight.value) {
......@@ -269,34 +184,7 @@
});
});
</script>
<style scoped>
.editor-container {
display: flex;
}
.editor-left {
flex: 1;
height: 100%;
overflow-y: hidden;
}
.editor-right {
flex: 1;
height: 100%;
overflow-y: hidden;
}
.editor-wrapper {
display: flex;
justify-content: space-between;
}
.editor-left,
.editor-right {
flex: 1;
overflow: hidden;
}
<style lang="less" scoped>
:deep(.CodeMirror) {
height: 700px !important;
}
......
src/views/scriptDevelopment/shellDevelopment/shellExecute/versionManagementModal.vue
View file @ 9db00b63
......@@ -52,11 +52,13 @@
import { versionColumns, versionSchema } from './version.data';
import { message } from 'ant-design-vue';
import { router } from '@/router';
const id = ref();
const title = ref();
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setModalProps({ confirmLoading: false });
console.log(data)
title.value = data.title;
id.value = data.id;
});
const [registerTable] = useTable({
dataSource: versionSchema,
......@@ -71,8 +73,12 @@
});
function handleDetail() {
console.log('查看详情');
console.log(id.value);
router.push({
path: '/scriptDevelopment/shellDevelopment/shellExecute/versionDetail',
query: {
id: id.value,
},
});
}
function modEdit() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment