Commit bb2413b0 authored by 曹泽华's avatar 曹泽华

数仓规划 物理模型改

parent 1fbdfe5e
......@@ -15,7 +15,24 @@
@click="handleMoreCreate"
>批量建表</a-button
>
<a-button type="primary" @click="handleBaseImport">从元数据导入</a-button>
<a-button
type="primary"
:disabled="getRowSelection().selectedRowKeys <= 0"
@click="handleWaitPublish"
>设为待发布</a-button
>
<a-button
type="primary"
:disabled="getRowSelection().selectedRowKeys <= 0"
@click="handlePublish"
>发布</a-button
>
<a-button
type="primary"
:disabled="getRowSelection().selectedRowKeys <= 0"
@click="handleBaseImport"
>从元数据导入</a-button
>
<a-button type="primary" :disabled="getRowSelection().selectedRowKeys <= 0">导出</a-button>
<a-button type="primary" @click="handleImport">导入</a-button>
<a-button type="primary" @click="handleCreateFolder">新建文件夹</a-button>
......@@ -39,8 +56,9 @@
{
icon: 'ion:ellipsis-horizontal-outline',
popConfirm: {
okText: '上移',
cancelText: '下移',
title: '请选择',
okText: '下移',
cancelText: '上移',
placement: 'bottom',
confirm: handleUp.bind(null, record),
cancel: handleDown.bind(null, record),
......@@ -65,7 +83,6 @@
<script lang="ts" setup>
import { reactive, unref, onDeactivated, onMounted, ref, nextTick } from 'vue';
import { BasicTable, useTable, TableAction } from '@/components/Table';
import { getAccountList, deleteUser, exportUserList } from '@/api/system/user/user';
import { PageWrapper } from '@/components/Page';
import { useMessage } from '@/hooks/web/useMessage';
import { useModal } from '@/components/Modal';
......@@ -135,12 +152,9 @@
columns: columnsSystem,
rowSelection: true,
formConfig: {
labelWidth: 100,
labelWidth: 10,
schemas: searchFormSchema,
autoSubmitOnEnter: true,
resetFunc: () => {
searchInfo.modelId = '';
},
},
useSearchForm: true,
showTableSetting: false,
......@@ -194,6 +208,20 @@
});
}
/** 设为待发布*/
function handleWaitPublish() {
openMoreCreate(true, {
isUpdate: false,
});
}
/** 发布*/
function handlePublish() {
openMoreCreate(true, {
isUpdate: false,
});
}
/** 新建文件夹*/
function handleCreateFolder() {
openModalAdd(true, {
......@@ -227,10 +255,10 @@
createMessage.success('删除成功!');
}
function handleUp() {
createMessage.success('移成功!');
createMessage.success('移成功!');
}
function handleDown() {
createMessage.success('移成功!');
createMessage.success('移成功!');
}
/** 编辑按钮*/
function handleEdit(record: Recordable) {
......
import { BasicColumn, FormSchema } from '@/components/Table';
import {selectProps} from "ant-design-vue/es/select";
export const columnsSystem: BasicColumn[] = [
{
......@@ -119,7 +118,6 @@ export const historyColumnsData: BasicColumn[] = [
width: 150,
// onEditRow:true
},
];
export const columnsMoreCreate = [
......@@ -129,7 +127,7 @@ export const columnsMoreCreate = [
width: 150,
// onEditRow:true
},
]
];
export const columnsDetail: BasicColumn[] = [
{
......
<template>
<div style="margin: 20px">
<div class="comparsion-maintitle">物理模型</div>
<slot name="title"><div class="comparsion-maintitle">物理模型</div></slot>
<Description
size="middle"
:bordered="false"
......
......@@ -158,7 +158,7 @@
</div>
</Tabs.TabPane>
<Tabs.TabPane key="3" tab="模型关系">
<ModelRelationship />
<ModelRelationship :edit-flag="editFlag" />
</Tabs.TabPane>
<Tabs.TabPane key="4" v-if="!editFlag" tab="模型关联">
<SourceData style="margin-top: 20px" />
......
import { getAllRoleList } from '@/api/system/role/role';
import { BasicColumn, FormSchema } from '@/components/Table';
import { h } from 'vue';
import { Tag, Switch } from 'ant-design-vue';
import { useMessage } from '@/hooks/web/useMessage';
import { changeFlagApi } from '@/api/system/user/user';
import {DescItem} from "@/components/Description";
import { DescItem } from '@/components/Description';
// 引入开关组件
type CheckedType = boolean | string | number;
export const entityColumns: BasicColumn[] = [
{
title: '名称',
......
import { FormSchema } from '@/components/Form';
import { BasicColumn } from '@/components/Table';
import {PhysicalColumns} from "@/views/dataWarehousePlanning/physicalModel/modelDetail/model.data";
export const infoData = {
dataBase: '测试类型',
......
......@@ -5,6 +5,7 @@
v-bind="$attrs"
@register="registerModal"
:title="getTitle"
@ok="handleSubmit"
>
<Alert type="success" message="调试成功" show-icon />
<div style="margin-top: 10px; width: 100%; height: 100%">
......@@ -15,7 +16,8 @@
<script lang="ts" setup>
import { ref, computed, unref, reactive } from 'vue';
import { BasicModal, useModalInner } from '@/components/Modal';
import {Alert} from "ant-design-vue";
import { Alert } from 'ant-design-vue';
import { useMessage } from '@/hooks/web/useMessage';
defineOptions({ name: 'DebugModal' });
......@@ -30,7 +32,12 @@
});
isUpdate.value = !!data?.isUpdate;
});
const { createMessage } = useMessage();
function handleSubmit() {
closeModal();
createMessage.success('调试成功');
}
const getTitle = computed(() => '建表调试日志');
</script>
<style lang="scss" scoped>
......
......@@ -14,22 +14,16 @@
<script lang="ts" setup>
import { ref, unref } from 'vue';
import BasicTable from '@/components/Table/src/BasicTable.vue';
import { BasicModal, useModal, useModalInner } from '@/components/Modal';
import { useTable } from '@/components/Table';
import {
moreCreateData,
TreeSystem,
} from '@/views/dataWarehousePlanning/physicalModel/modelData';
import {
columnsMoreCreate,
columnsSystem,
searchFormSchema,
} from '@/views/dataWarehousePlanning/physicalModel/model.data';
import { BasicModal, useModalInner } from '@/components/Modal';
import {BasicTableProps, useTable} from '@/components/Table';
import { moreCreateData } from '@/views/dataWarehousePlanning/physicalModel/modelData';
import { columnsMoreCreate } from '@/views/dataWarehousePlanning/physicalModel/model.data';
import {DynamicProps} from "#/utils";
const getTitle = ref('确认批量建表?');
const isUpdate = ref(false);
const isMove = ref(false);
const [registerTable] = useTable({
const [registerTable] = useTable(<BasicTableProps>{
title: '',
api: async (params) => {
console.log('params:', params);
......@@ -42,33 +36,31 @@
message: '',
data: moreCreateData,
};
return { ...response }
},
columns: columnsMoreCreate,
showIndexColumn: false,
rowSelection: false,
striped: false,
useSearchForm: false,
showTableSetting: false,
bordered: true,
handleSearchInfoFn(info) {
return info;
},
});
//初始化弹框
const [registerVersionModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setModalProps({ confirmLoading: false });
isUpdate.value = !!data?.isUpdate;
isMove.value = !!data?.isMove;
if (unref(isUpdate)) {
// 获取行数据的id
rowId.value = data.record.businessId;
// 塞值
await setFieldsValue({
...data.record,
});
}
});
const [registerVersionModal, { setFieldsValue, setModalProps, closeModal }] = useModalInner(
async (data) => {
setModalProps({ confirmLoading: false });
isUpdate.value = !!data?.isUpdate;
isMove.value = !!data?.isMove;
if (unref(isUpdate)) {
// 获取行数据的id
// 塞值
await setFieldsValue({
...data.record,
});
}
},
);
async function handleSubmit() {
closeModal();
}
......
......@@ -14,7 +14,11 @@
<Detail />
</div>
<div style="flex: 1">
<Detail />
<Detail>
<template #title>
<div class="comparsion-maintitle">元模型</div>
</template></Detail
>
</div>
</div>
<div class="comparsion-title">列信息</div>
......@@ -139,4 +143,9 @@
margin-bottom: 15px;
margin-left: 20px;
}
.comparsion-maintitle {
font-size: 18px;
font-weight: 650;
margin-bottom: 15px;
}
</style>
......@@ -4,17 +4,19 @@
<template #toolbar>
<a-button
:disabled="getRowSelection().selectedRowKeys <= 0"
v-if="editFlag"
type="primary"
@click="handleDelete"
><DeleteTwoTone />删除</a-button
>
<a-button type="primary" @click="handleCrossModel"
<a-button v-if="editFlag" type="primary" @click="handleCrossModel"
><PlusCircleTwoTone />新增模型关系</a-button
>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
v-if="editFlag"
:actions="[
{
icon: 'clarity:note-edit-line',
......@@ -54,6 +56,12 @@
const tableData = ref([]);
// 模态框
const [crossModal, { openModal }] = useModal();
const { editFlag } = defineProps({
editFlag: {
type: Boolean,
default: true,
},
});
// 实体新增
function handleCrossModel() {
openModal(true, {
......@@ -68,7 +76,6 @@
});
}
// 模态框保存
function crossSuccess({ isUpdate, values }) {
if (isUpdate) {
......
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