逻辑模型详情

src/router/routes/index.ts

@@ -118,11 +118,11 @@ export const DataWarehousePlanningRoute: AppRouteRecordRaw = {
   },
   children: [
     {
-      path: 'logicalModel/edit',
+      path: 'logicalModel/detail',
       name: 'logicalModel',
-      component: () => import('@/views/dataWarehousePlanning/logicalModel/modelEdit/index.vue'),
+      component: () => import('@/views/dataWarehousePlanning/logicalModel/modelDetail/index.vue'),
       meta: {
-        title: '编辑逻辑模型',
+        title: '逻辑模型详情',
         icon: '',
       },
     },

src/views/dataWarehousePlanning/logicalModel/index.vue

@@ -3,8 +3,15 @@
     <ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
     <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
       <template #toolbar>
+        <a-button type="primary">转换记录</a-button>
+        <a-button type="primary">转物理模型</a-button>
+        <a-button type="primary">设为待发布</a-button>
+        <a-button type="primary">发布</a-button>
+        <a-button type="primary" @click="handleImport">导入</a-button>
+        <a-button type="primary" @click="handleExport">导出</a-button>
         <a-button type="primary" @click="handleCreateFile">新建文件夹</a-button>
-        <a-button type="primary" @click="handleCreateModel">新建元模型</a-button>
+        <a-button type="primary" @click="handleCreateModel">新建文件</a-button>
+        <a-button type="primary">删除</a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -41,189 +48,188 @@
   </PageWrapper>
 </template>
 <script lang="ts" setup>
-import { reactive, onMounted, ref } from 'vue';
-import { BasicTable, useTable, TableAction } from '@/components/Table';
-import { PageWrapper } from '@/components/Page';
-import ModelTree from './ModelTree.vue';
-import { useMessage } from '@/hooks/web/useMessage';
-import { useModal } from '@/components/Modal';
-import ModelModal from './modelModal.vue';
-import ModelEdit from './modelEdit.vue';
-import { useRouter } from 'vue-router';
-import { columns, searchFormSchema } from './model.data';
-import { useGo } from '@/hooks/web/usePage';
-import { useRoute, onBeforeRouteLeave } from 'vue-router';
-import { useFilterStore } from '@/store/modules/filterData';
-import { TreeData } from '@/views/dataWarehousePlanning/logicalModel/modelData';
+  import { reactive, onMounted, ref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '@/components/Table';
+  import { PageWrapper } from '@/components/Page';
+  import ModelTree from './ModelTree.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+  import { useModal } from '@/components/Modal';
+  import ModelModal from './modelModal.vue';
+  import ModelEdit from './modelEdit.vue';
+  import { useRouter, useRoute, onBeforeRouteLeave } from 'vue-router';
+  import { columns, searchFormSchema } from './model.data';
+  import { useGo } from '@/hooks/web/usePage';
+  import { useFilterStore } from '@/store/modules/filterData';
+  import { TreeData } from '@/views/dataWarehousePlanning/logicalModel/modelData';
 
-defineOptions({ name: 'AccountManagement' });
-const { createMessage } = useMessage();
-const filterStore = useFilterStore();
-const route = useRoute();
-const go = useGo();
-const { push } = useRouter();
-const [registerModal, { openModal }] = useModal();
-const [registerModelEdit, { openModal: openEditUserModal }] = useModal();
-const [registerAddUserModal, { openModal: addUserModal }] = useModal();
-const [registerMoveUser, { openModal: openMoveUserModal }] = useModal();
-const searchInfo = reactive<Recordable>({});
-const tableData = ref([]);
-const [
-  registerTable,
-  { reload, updateTableDataRecord, getSearchInfo, getForm, getRowSelection },] = useTable({
-  title: '',
-  api: async (params) => {
-    console.log('params:', params);
-    const response = {
-      pageNu: '1',
-      pageSize: '10',
-      pages: '1',
-      total: tableData.value.length,
-      code: '',
-      message: '',
-      data: [],
-    };
-    //过滤data中的数据，取出等于params.deptId的数据
-    var data = [];
-    //按照部门筛选 如果有进行过滤相应部门的  没有就赋值全部
-    var data = [];
-    data = tableData.value.filter((item) => item.businessId !== 100);
-    return { ...response, data: data };
-  },
-  rowKey: 'businessId',
-  columns,
-  rowSelection: true,
-  formConfig: {
-    labelWidth: 120,
-    schemas: searchFormSchema,
-    autoSubmitOnEnter: true,
-    resetFunc: () => {
-      searchInfo.modelId = '';
+  defineOptions({ name: 'AccountManagement' });
+  const { createMessage } = useMessage();
+  const filterStore = useFilterStore();
+  const route = useRoute();
+  const go = useGo();
+  const { push } = useRouter();
+  const [registerModal, { openModal }] = useModal();
+  const [registerModelEdit, { openModal: openEditUserModal }] = useModal();
+  const [registerAddUserModal, { openModal: addUserModal }] = useModal();
+  const [registerMoveUser, { openModal: openMoveUserModal }] = useModal();
+  const searchInfo = reactive<Recordable>({});
+  const tableData = ref([]);
+  const [
+    registerTable,
+    { reload, updateTableDataRecord, getSearchInfo, getForm, getRowSelection },
+  ] = useTable({
+    title: '逻辑模型',
+    api: async (params) => {
+      console.log('params:', params);
+      const response = {
+        pageNu: '1',
+        pageSize: '10',
+        pages: '1',
+        total: tableData.value.length,
+        code: '',
+        message: '',
+        data: [],
+      };
+      //过滤data中的数据，取出等于params.deptId的数据
+      //按照部门筛选 如果有进行过滤相应部门的  没有就赋值全部
+      let data = [];
+      data = tableData.value.filter((item) => item.businessId !== 100);
+      return { ...response, data: data };
+    },
+    rowKey: 'businessId',
+    columns,
+    rowSelection: true,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      resetFunc: () => {
+        searchInfo.modelId = '';
+      },
+    },
+    useSearchForm: true,
+    showTableSetting: false,
+    bordered: true,
+    handleSearchInfoFn(info) {
+      return info;
+    },
+    actionColumn: {
+      width: 150,
+      title: '操作',
+      dataIndex: 'action',
     },
-  },
-  useSearchForm: true,
-  showTableSetting: false,
-  bordered: true,
-  handleSearchInfoFn(info) {
-    return info;
-  },
-  actionColumn: {
-    width: 150,
-    title: '操作',
-    dataIndex: 'action',
-  },
-});
-
-/** 新增元模型*/
-function handleCreateModel() {
-  openModal(true, {
-    isUpdate: false,
   });
-}
 
-/** 新增文件夹*/
-function handleCreateFile() {
-  openModal(true, {
-    isUpdate: false,
-  });
-}
+  /** 新增元模型*/
+  function handleCreateModel() {
+    openModal(true, {
+      isUpdate: false,
+    });
+  }
 
-/** 移动按钮*/
-function handleMove(record: Recordable) {
-  openMoveUserModal(true, {
-    record,
-    isMove: true,
-  });
-}
+  /** 新增文件夹*/
+  function handleCreateFile() {
+    openEditUserModal(true, {
+      isUpdate: false,
+    });
+  }
 
-/** 编辑按钮*/
-function handleEdit(record: Recordable) {
-  openEditUserModal(true, {
-    record,
-    isUpdate: true,
-  });
-}
+  /** 移动按钮*/
+  function handleMove(record: Recordable) {
+    openMoveUserModal(true, {
+      record,
+      isMove: true,
+    });
+  }
 
-/** 删除按钮*/
-function handleDelete(record: Recordable) {
-  tableData.value.splice(
-    tableData.value.findIndex((item) => item.businessId === record.businessId),
-    1,
-  );
-  createMessage.success('删除成功!');
-  reload();
-}
+  /** 编辑按钮*/
+  function handleEdit(record: Recordable) {
+    openEditUserModal(true, {
+      record,
+      isUpdate: true,
+    });
+  }
 
-/** 新增/编辑成功*/
-function handleSuccess({ isUpdate, values }) {
-  if (isUpdate) {
-    // 注意：updateTableDataRecord要求表格的rowKey属性为string并且存在于每一行的record的keys中
-    //修改表单的值
-    const result = updateTableDataRecord(values.businessId, values);
-    reload();
-  } else {
-    tableData.value.push(values);
+  /** 删除按钮*/
+  function handleDelete(record: Recordable) {
+    tableData.value.splice(
+      tableData.value.findIndex((item) => item.businessId === record.businessId),
+      1,
+    );
+    createMessage.success('删除成功!');
     reload();
   }
-}
 
-/** 进入编辑逻辑模型 */
-function goEdit(record) {
-  console.log('record:',record)
-  push({
-    path: '/dataWarehousePlanning/logicalModel/edit',
-    query: record,
-  });
-}
-/** 移动*/
-function handleMoveSuccess({ isMove, values }) {
-  const rowSelection = getRowSelection().selectedRowKeys;
-  if (rowSelection.length > 0) {
-    //批量移动
-    for (let i = 0; i < rowSelection.length; i++) {
-      const result = updateTableDataRecord(values[i].institutionId, values[i]);
+  /** 新增/编辑成功*/
+  function handleSuccess({ isUpdate, values }) {
+    if (isUpdate) {
+      // 注意：updateTableDataRecord要求表格的rowKey属性为string并且存在于每一行的record的keys中
+      //修改表单的值
+      const result = updateTableDataRecord(values.businessId, values);
+      reload();
+    } else {
+      tableData.value.push(values);
+      reload();
+    }
+  }
+
+  /** 进入编辑逻辑模型 */
+  function goEdit(record) {
+    console.log('record:', record);
+    push({
+      path: '/dataWarehousePlanning/logicalModel/detail',
+      query: record,
+    });
+  }
+  /** 移动*/
+  function handleMoveSuccess({ isMove, values }) {
+    const rowSelection = getRowSelection().selectedRowKeys;
+    if (rowSelection.length > 0) {
+      //批量移动
+      for (let i = 0; i < rowSelection.length; i++) {
+        const result = updateTableDataRecord(values[i].institutionId, values[i]);
+      }
+    } else {
+      //单个移动
+      const result = updateTableDataRecord(values.businessId, values);
     }
-  } else {
-    //单个移动
-    const result = updateTableDataRecord(values.businessId, values);
+    reload();
   }
-  reload();
-}
 
-/** 部门树的select*/
-function handleSelect(modelId = '') {
-  searchInfo.modelId = modelId;
-  reload();
-}
+  /** 部门树的select*/
+  function handleSelect(modelId = '') {
+    searchInfo.modelId = modelId;
+    reload();
+  }
 
-function handleView(record: Recordable) {
-  go('/system/account_detail/' + record.id);
-}
+  function handleView(record: Recordable) {
+    go('/system/account_detail/' + record.id);
+  }
 
-onMounted(() => {
-  tableData.value = TreeData;
-  const path = route.path;
-  if (filterStore.getSearchParams[path]) {
-    if (JSON.parse(filterStore.getSearchParams[path] !== {})) {
-      const params = JSON.parse(filterStore.getSearchParams[path]);
-      getForm().setFieldsValue({
-        page: params.page,
-        pageSize: params.pageSize,
-        username: params.username,
-        flag: params.flag,
-      });
-      searchInfo.institutionId = params.institutionId;
+  onMounted(() => {
+    tableData.value = TreeData;
+    const path = route.path;
+    if (filterStore.getSearchParams[path]) {
+      if (JSON.parse(filterStore.getSearchParams[path] !== {})) {
+        const params = JSON.parse(filterStore.getSearchParams[path]);
+        getForm().setFieldsValue({
+          page: params.page,
+          pageSize: params.pageSize,
+          username: params.username,
+          flag: params.flag,
+        });
+        searchInfo.institutionId = params.institutionId;
+      }
     }
-  }
-});
-onBeforeRouteLeave((to, from, next) => {
-  const params = Object.assign({}, getSearchInfo(), getForm().getFieldsValue());
-  filterStore.setSearchParams({
-    path: from.path,
-    param: {
-      ...params,
-    },
   });
-  next(); // 允许导航
-});
+  onBeforeRouteLeave((to, from, next) => {
+    const params = Object.assign({}, getSearchInfo(), getForm().getFieldsValue());
+    filterStore.setSearchParams({
+      path: from.path,
+      param: {
+        ...params,
+      },
+    });
+    next(); // 允许导航
+  });
 </script>

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

@@ -52,12 +52,11 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'name',
-    label: '名称',
     component: 'Input',
     componentProps: {
-      placeholder: '搜索主题域名称、英文名',
+      placeholder: '输入关键字搜索',
     },
-    colProps: { span: 7 },
+    colProps: { span: 4 },
   },
 ];
 export const searchFormTwoSchema: FormSchema[] = [
@@ -84,11 +83,10 @@ export const modelFormSchema: any[] = [
       },
       getPopupContainer: () => document.body,
     },
-    required: true,
   },
   {
     field: 'name',
-    label: '元模型名称',
+    label: '文件名称',
     component: 'Input',
     colProps: { lg: 24, md: 24 },
     rules: [
@@ -98,6 +96,17 @@ export const modelFormSchema: any[] = [
       },
     ],
   },
+  {
+    field: 'type',
+    label: '文件类型',
+    component: 'Input',
+    componentProps: {
+      defaultValue: '逻辑模型',
+      disabled: true,
+      readOnly: true,
+    },
+    colProps: { lg: 24, md: 24 },
+  },
 ];
 export const editFormSchema: any[] = [
   {

src/views/dataWarehousePlanning/logicalModel/modelEdit/ModelTree.vue → src/views/dataWarehousePlanning/logicalModel/modelDetail/ModelTree.vue

@@ -15,7 +15,7 @@
   import { nextTick, onMounted, ref, unref } from 'vue';
   import { BasicTree, TreeActionType, TreeItem } from '@/components/Tree';
   import { Nullable } from '@vben/types';
-  import { TreeData } from '@/views/dataWarehousePlanning/logicalModel/modelEdit/modelData';
+  import { TreeData } from '@/views/dataWarehousePlanning/logicalModel/modelDetail/modelData';
 
   defineOptions({ name: 'DeptTree' });
 

src/views/dataWarehousePlanning/logicalModel/modelEdit/modelEdit.vue → src/views/dataWarehousePlanning/logicalModel/modelDetail/modelEdit.vue

@@ -7,8 +7,8 @@
     @ok="handleSubmit"
   >
     <Tabs v-model:activeKey="planType" size="large" @change="clickTab">
-      <a-tab-pane key="基本信息" tab="基本信息"></a-tab-pane>
-      <a-tab-pane key="实体" tab="实体"></a-tab-pane>
+      <a-tab-pane key="基本信息" tab="基本信息" />
+      <a-tab-pane key="实体" tab="实体" />
     </Tabs>
     <BasicForm @register="registerForm" />
   </BasicModal>
@@ -18,7 +18,7 @@
   import { Tabs } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
-  import {editFormSchema, modelFormSchema} from './model.data';
+  import { editFormSchema, modelFormSchema } from './model.data';
   import { useMessage } from '@/hooks/web/useMessage';
   import { TreeData } from '@/views/metaModel/knowledgeModel/modelData';
   import { router } from '@/router';
@@ -30,7 +30,7 @@
   const isUpdate = ref(true);
   const isMove = ref(false);
   const rowId = ref('');
-  const planType = ref('基本信息')
+  const planType = ref('基本信息');
   //获取接口数据并放在下拉框里（这里是打开了一个弹框）
   //初始化表单
   const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
@@ -57,8 +57,7 @@
       });
     }
   });
-  async function clickTab(value){
-  }
+  async function clickTab(value) {}
   const getTitle = computed(() => '编辑文件夹');
 
   /**确定按钮*/
@@ -72,4 +71,3 @@
     closeModal();
   }
 </script>
-

src/views/dataWarehousePlanning/logicalModel/modelEdit/modelModal.vue → src/views/dataWarehousePlanning/logicalModel/modelDetail/modelModal.vue

@@ -15,7 +15,7 @@
   import { BasicForm, useForm } from '@/components/Form';
   import { modelFormSchema } from './model.data';
   import { useMessage } from '@/hooks/web/useMessage';
-  import { TreeData } from '@/views/dataWarehousePlanning/logicalModel/modelEdit/modelData';
+  import { TreeData } from '@/views/dataWarehousePlanning/logicalModel/modelDetail/modelData';
   import { router } from '@/router';
 
   defineOptions({ name: 'ModelModal' });