Merge remote-tracking branch 'origin/master'

src/views/dataWarehousePlanning/logicalModel/modelDetail/versionModel.vue

@@ -23,9 +23,9 @@
               <!--对比-->
               <VerticalAlignMiddleOutlined @click="handleComparison" rotate="90" class="my-icon" />
               <!--回滚-->
-              <RollbackOutlined class="my-icon" />
+              <RollbackOutlined class="my-icon" @click="handleRollBack(item)" />
               <!--删除-->
-              <DeleteOutlined class="my-icon" style="color: red" />
+              <DeleteOutlined class="my-icon" @click="handleDelete(item)" style="color: red" />
             </div>
           </div>
           <div>
@@ -38,6 +38,7 @@
 </template>
 <script lang="ts" setup>
   import { ref, unref, defineEmits } from 'vue';
+  import { Tabs, Descriptions, Alert, Modal, message } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicTree } from '@/components/Tree';
   import { BasicForm, useForm } from '@/components/Form';
@@ -50,6 +51,9 @@
     DeleteOutlined,
   } from '@ant-design/icons-vue';
   import { useRouter } from 'vue-router';
+  import { useMessage } from '@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
 
   const { push } = useRouter();
 
@@ -95,6 +99,24 @@
       path: '/dataWarehousePlanning/logicalModel/version-comparison',
     });
   }
+  function handleRollBack(item) {
+    Modal.confirm({
+      title: '回滚版本',
+      content: '确定要滚动至' + item.version + '版本吗?',
+      onOk: () => {
+        createMessage.success('回滚成功!');
+      },
+    });
+  }
+  function handleDelete(item) {
+    Modal.confirm({
+      title: '删除版本',
+      content: '确定要删除' + item.version + '版本吗?',
+      onOk: () => {
+        createMessage.success('删除成功!');
+      },
+    });
+  }
   // const getTitle = computed(() => (isUpdate.value ? '编辑实体' : '新建实体'));
   const getTitle = '转物理模型';
 

src/views/dataWarehousePlanning/physicalModel/model.data.ts

@@ -169,7 +169,7 @@ export const physicalModelFormSchema: any[] = [
     required: true,
   },
   {
-    field: 'name',
+    field: 'modelName',
     label: '文件名称',
     component: 'Input',
     colProps: { lg: 24, md: 24 },

src/views/dataWarehousePlanning/physicalModel/modelModal.vue

@@ -63,7 +63,7 @@
     ]);
   });
 
-  const getTitle = computed(() => '新建文件');
+  const getTitle = computed(() => (isUpdate.value ? '编辑文件' : '新建文件'));
 
   function handleTree(data, id, parentId, children, rootId) {
     id = id || 'id';