Commit 8968f8b9 authored by 罗林杰's avatar 罗林杰

修改版本管理和保存

parent 73f38de0
...@@ -617,3 +617,34 @@ export const globalOptionsSchema: FormSchema[] = [ ...@@ -617,3 +617,34 @@ export const globalOptionsSchema: FormSchema[] = [
colProps: { lg: 24, md: 24 }, colProps: { lg: 24, md: 24 },
}, },
]; ];
export const saveSchema: FormSchema[] = [
{
field: 'remark',
label: '版本变更描述',
component: 'InputTextArea',
required: true,
colProps: { lg: 24, md: 24 },
},
];
export const versionManageColumns: BasicColumn[] = [
{
title: '版本名称',
dataIndex: 'name',
width: 100,
},
{
title: '提交人',
dataIndex: 'user',
width: 100,
},
{
title: '提交时间',
dataIndex: 'date',
width: 140,
},
{
title: '备注',
dataIndex: 'remark',
width: 140,
},
];
...@@ -191,6 +191,8 @@ ...@@ -191,6 +191,8 @@
<AddDataConversionRuleModal @register="registerAddRuleModal" /> <AddDataConversionRuleModal @register="registerAddRuleModal" />
<DataOptionsModal @register="registerDataOptionsModal" /> <DataOptionsModal @register="registerDataOptionsModal" />
<GlobalOptionsModal @register="registerGlobalOptionsModal" /> <GlobalOptionsModal @register="registerGlobalOptionsModal" />
<SaveModal @register="registerSaveModal" />
<VersionManageModal @register="registerVersionManageModal" />
</PageWrapper> </PageWrapper>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
...@@ -224,6 +226,8 @@ ...@@ -224,6 +226,8 @@
import AddDataConversionRuleModal from '@/views/dataIntegration/dataLoading/dataEntryLake/addDataConversionRuleModal.vue'; import AddDataConversionRuleModal from '@/views/dataIntegration/dataLoading/dataEntryLake/addDataConversionRuleModal.vue';
import DataOptionsModal from '@/views/dataIntegration/dataLoading/dataEntryLake/dataOptionsModal.vue'; import DataOptionsModal from '@/views/dataIntegration/dataLoading/dataEntryLake/dataOptionsModal.vue';
import GlobalOptionsModal from '@/views/dataIntegration/dataLoading/dataEntryLake/globalOptionsModal.vue'; import GlobalOptionsModal from '@/views/dataIntegration/dataLoading/dataEntryLake/globalOptionsModal.vue';
import SaveModal from '@/views/dataIntegration/dataLoading/dataEntryLake/saveModal.vue';
import VersionManageModal from '@/views/dataIntegration/dataLoading/dataEntryLake/versionManageModal.vue';
const route = useRoute(); const route = useRoute();
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
...@@ -506,6 +510,8 @@ ...@@ -506,6 +510,8 @@
const [registerAddRuleModal, { openModal: openAddRuleModal }] = useModal(); const [registerAddRuleModal, { openModal: openAddRuleModal }] = useModal();
const [registerDataOptionsModal, { openModal: openDataOptionsModal }] = useModal(); const [registerDataOptionsModal, { openModal: openDataOptionsModal }] = useModal();
const [registerGlobalOptionsModal, { openModal: openGlobalOptionsModal }] = useModal(); const [registerGlobalOptionsModal, { openModal: openGlobalOptionsModal }] = useModal();
const [registerSaveModal, { openModal: openSaveModal }] = useModal();
const [registerVersionManageModal, { openModal: openVersionManageModal }] = useModal();
const [ const [
registerSourceSideConfigurationForm, registerSourceSideConfigurationForm,
...@@ -728,8 +734,9 @@ ...@@ -728,8 +734,9 @@
return; return;
} }
await submitSourceSideConfiguration(); await submitSourceSideConfiguration();
createMessage.success('保存成功'); openSaveModal(true, {
router.back(); title: '发布新版本',
});
} catch (error) { } catch (error) {
console.error('保存失败:', error); console.error('保存失败:', error);
createMessage.error('表单校验未通过,请检查输入'); createMessage.error('表单校验未通过,请检查输入');
...@@ -761,6 +768,11 @@ ...@@ -761,6 +768,11 @@
title: '数据加载全局配置', title: '数据加载全局配置',
}); });
} }
function handleVersionManagement() {
openVersionManageModal(true, {
title: '数据加载版本管理',
});
}
function handleConversion(record) { function handleConversion(record) {
createMessage.success('数据转换成功' + record.fieldType); createMessage.success('数据转换成功' + record.fieldType);
......
...@@ -1267,3 +1267,29 @@ export const goalFieldNameMappingRuleTableList = [ ...@@ -1267,3 +1267,29 @@ export const goalFieldNameMappingRuleTableList = [
fieldType: 'DECIMAL(10,2)', fieldType: 'DECIMAL(10,2)',
}, },
]; ];
export const versionManageData: any[] = [
{
name: 'V1.0',
user: 'admin',
remark: '已发布',
date: '2024-10-24 10:04:04',
},
{
name: 'V1.1',
user: 'admin',
remark: '已发布',
date: '2024-10-24 10:04:04',
},
{
name: 'V1.2',
user: 'admin',
remark: '已发布',
date: '2024-10-24 10:04:04',
},
{
name: 'V1.3',
user: 'admin',
remark: '已发布',
date: '2024-10-24 10:04:04',
},
];
<template>
<BasicModal
width="30%"
v-bind="$attrs"
@register="registerModal"
:title="title"
@ok="handleSubmit"
>
<BasicForm @register="registerForm" />
</BasicModal>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import { BasicModal, useModalInner } from '@/components/Modal';
import { useMessage } from '@/hooks/web/useMessage';
import { BasicForm, useForm } from '@/components/Form';
import { saveSchema } from '@/views/dataIntegration/dataLoading/dataEntryLake/dataEntry.data';
defineOptions({ name: 'KnowledgeModal' });
const emit = defineEmits(['success', 'register']);
const { createMessage } = useMessage();
const title = ref();
//获取接口数据并放在下拉框里(这里是打开了一个弹框)
//初始化表单
const [registerForm, { resetFields }] = useForm({
labelWidth: 120,
baseColProps: { lg: 12, md: 24 },
schemas: saveSchema,
showActionButtonGroup: false,
actionColOptions: {
span: 23,
},
});
//初始化弹框
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
await resetFields();
setModalProps({ confirmLoading: false });
title.value = data.title;
});
async function handleSubmit() {
closeModal();
createMessage.success('提交成功');
await resetFields();
}
</script>
<template>
<BasicModal
width="40%"
v-bind="$attrs"
@register="registerModal"
:title="title"
@ok="handleSubmit"
>
<template #footer>
<a-button type="primary" @click="handleSubmit">关闭</a-button>
</template>
<BasicTable @register="registerTable">
<template #bodyCell="{ column }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{
label: '回滚',
onClick: handleRollback.bind(null),
},
{
label: '查看详情',
onClick: handleDetail.bind(null),
},
]"
/>
</template>
</template>
</BasicTable>
</BasicModal>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { BasicModal, useModalInner } from '@/components/Modal';
import { useMessage } from '@/hooks/web/useMessage';
import { BasicTable, TableAction, useTable } from '@/components/Table';
import { versionManageColumns } from '@/views/dataIntegration/dataLoading/dataEntryLake/dataEntry.data';
import { versionManageData } from '@/views/dataIntegration/dataLoading/dataEntryLake/mock';
defineOptions({ name: 'KnowledgeModal' });
const emit = defineEmits(['success', 'register']);
const { createMessage } = useMessage();
const title = ref();
const tableData = ref([]);
//获取接口数据并放在下拉框里(这里是打开了一个弹框)
//初始化表单
const [registerTable, { reload }] = useTable({
api: async () => {
const response = {
pageNum: '1',
pageSize: '10',
pages: '1',
total: tableData.value.length,
code: '',
message: '',
data: [],
};
//过滤data中的数据,取出等于params.deptId的数据
var data = [];
data = tableData.value;
return { ...response, data: data };
},
pagination: false,
columns: versionManageColumns,
useSearchForm: false,
showTableSetting: false,
bordered: true,
actionColumn: {
width: 150,
title: '操作',
dataIndex: 'action',
},
showIndexColumn: false,
});
//初始化弹框
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
await reload();
setModalProps({ confirmLoading: false });
title.value = data.title;
});
function handleRollback() {
createMessage.success('回滚成功');
}
function handleDetail() {}
async function handleSubmit() {
closeModal();
}
onMounted(() => {
tableData.value = versionManageData;
});
</script>
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