Merge remote-tracking branch 'origin/master'

src/views/metadata/metadataComparison/index.vue

@@ -5,7 +5,7 @@
         <a-button style="margin-right: 5px" type="primary" @click="handleImport">导出</a-button>
       </div>
     </template>
-    <div class="w-1/2 xl:w-1/2">
+    <div class="w-1/2 xl:w-1/2 pl-4">
       <div>
         <BasicForm @register="registerMainForm" />
         <Description

src/views/metadata/versionContrastModal.vue

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    width="90%"
+    @register="registerDbModal"
+    title="版本详情"
+    :showOkBtn="false"
+  >
+    <template #footer>
+      <a-button type="primary" @click="handleSubmit">返回</a-button>
+    </template>
+    <div class="flex">
+      <div class="w-1/2 xl:w-1/2 pl-4">
+        <div>
+          <BasicForm @register="registerForm" />
+          <Description
+            size="middle"
+            title="基本属性"
+            :bordered="false"
+            :column="2"
+            :data="versionDetailData"
+            :schema="versionSchema"
+          />
+          <Description size="middle" title="表结构" :bordered="false" />
+          <BasicTable @register="registerStructureTable" />
+          <Description size="middle" title="索引" :bordered="false" />
+          <BasicTable @register="registerIndexTable" />
+          <Description size="middle" title="分区信息" :bordered="false" />
+          <BasicTable @register="registerPartitionTable" />
+          <Description size="middle" title="分桶信息" :bordered="false" />
+          <BasicTable @register="registerBucketingTable" />
+        </div>
+      </div>
+      <div class="w-1/2 xl:w-1/2">
+        <div>
+          <BasicForm @register="registerForm" />
+          <Description
+            size="middle"
+            title="基本属性"
+            :bordered="false"
+            :column="2"
+            :data="versionDetailData"
+            :schema="versionSchema"
+          />
+          <Description size="middle" title="表结构" :bordered="false" />
+          <BasicTable @register="registerStructureTable" />
+          <Description size="middle" title="索引" :bordered="false" />
+          <BasicTable @register="registerIndexTable" />
+          <Description size="middle" title="分区信息" :bordered="false" />
+          <BasicTable @register="registerPartitionTable" />
+          <Description size="middle" title="分桶信息" :bordered="false" />
+          <BasicTable @register="registerBucketingTable" />
+        </div>
+      </div>
+    </div>
+  </BasicModal>
+</template>
+<script setup lang="ts">
+  import BasicModal from '@/components/Modal/src/BasicModal.vue';
+  import { ref } from 'vue';
+
+  import {
+    bucketingColumns,
+    indexColumns,
+    partitionColumns,
+    structureColumns,
+    versionNumSchema,
+    versionSchema,
+  } from '@/views/metadata/data';
+  import {
+    bucketingTableData,
+    dbData,
+    indexData,
+    partitionData,
+    structureData,
+    versionDetailData,
+  } from '@/views/metadata/metadataData';
+  import { Description } from '@/components/Description';
+  import { useModalInner } from '@/components/Modal';
+  import { BasicTable, useTable } from '@/components/Table';
+  import { BasicForm, useForm } from '@/components/Form';
+
+  const tableData = ref([]);
+  const title = ref('');
+  const tableTitle = ref('');
+  const [registerDbModal, { closeModal }] = useModalInner(async (data) => {
+    title.value = data.workSpaceName;
+    tableTitle.value = data.name;
+    tableData.value = dbData;
+  });
+  const [registerForm] = useForm({
+    labelWidth: 100,
+    schemas: versionNumSchema,
+    showActionButtonGroup: false,
+  });
+  const [registerStructureTable] = useTable({
+    dataSource: structureData,
+    columns: structureColumns,
+    pagination: false,
+    showIndexColumn: false,
+    scroll: { y: 300 },
+  });
+  const [registerIndexTable] = useTable({
+    dataSource: indexData,
+    columns: indexColumns,
+    pagination: false,
+    showIndexColumn: false,
+    scroll: { y: 300 },
+  });
+  const [registerPartitionTable] = useTable({
+    dataSource: partitionData,
+    columns: partitionColumns,
+    pagination: false,
+    showIndexColumn: false,
+    scroll: { y: 300 },
+  });
+  const [registerBucketingTable] = useTable({
+    dataSource: bucketingTableData,
+    columns: bucketingColumns,
+    pagination: false,
+    showIndexColumn: false,
+    scroll: { y: 300 },
+  });
+  async function handleSubmit() {
+    closeModal();
+  }
+</script>
+<style scoped lang="less"></style>

src/views/metadata/versionModal.vue

@@ -12,8 +12,8 @@
           <TableAction
             :actions="[
               {
-                label: '提交',
-                onClick: handleEdit.bind(null),
+                label: '对比',
+                onClick: handleContract.bind(null),
               },
               {
                 label: '查看',
@@ -35,6 +35,7 @@
     </BasicTable>
   </BasicModal>
   <versionDetailModal @register="registerVersionDetailModal" />
+  <versionContractModal @register="registerVersionContractModal" />
 </template>
 <script lang="ts" setup>
   import { onMounted, ref } from 'vue';
@@ -44,6 +45,7 @@
   import { versionColumns, versionFormSchema } from '@/views/metadata/data';
   import { versionData } from '@/views/metadata/metadataData';
   import versionDetailModal from './versionDetailModal.vue';
+  import versionContractModal from './versionContrastModal.vue';
 
   defineOptions({ name: 'KnowledgeModal' });
 
@@ -52,6 +54,7 @@
   const title = ref();
   const tableData = ref([]);
   const [registerVersionDetailModal, { openModal: openVersionDetailModal }] = useModal();
+  const [registerVersionContractModal, { openModal: openVersionContractModal }] = useModal();
   const [registerTable, { reload }] = useTable({
     api: async () => {
       const response = {
@@ -99,8 +102,10 @@
       title: '版本详情',
     });
   }
-  function handleEdit() {
-    createMessage.success('提交成功');
+  function handleContract() {
+    openVersionContractModal(true, {
+      title: '版本对比',
+    });
   }
   function handleDelete() {
     createMessage.success('删除成功');