Merge remote-tracking branch 'origin/master'

src/router/routes/index.ts

@@ -235,6 +235,16 @@ export const DatasetByCreateDetailRoute: AppRouteRecordRaw = {
         icon: '',
       },
     },
+    {
+      path: 'datasetByApply/datasetByApplyDetail',
+      name: 'datasetByApplyDetail',
+      component: () =>
+        import('@/views/mallResourceDevelopment/dataSet/dataSetByApply/datasetByApplyDetail.vue'),
+      meta: {
+        title: '我申请的数据集详情',
+        icon: '',
+      },
+    },
   ],
 };
 /**商城资源开发-文件*/
@@ -429,8 +439,6 @@ export const DataWarehousephysicalModelRoute: AppRouteRecordRaw = {
   ],
 };
 
-
-
 /**元模型*/
 export const ModelRoute: AppRouteRecordRaw = {
   path: '/metaModel',

src/views/mallResourceDevelopment/benchmark/benchmarkManagement/atomLabel/index.vue

@@ -31,8 +31,8 @@
   import {
     atomFormSchema,
     atomTableColumn,
-  } from '@/views/mallResourceDevelopment/label/labelDevelop/atomLabel/atom.data';
-  import { atomTableData } from '@/views/mallResourceDevelopment/label/labelDevelop/atomLabel/atomData';
+  } from './atom.data';
+  import { atomTableData } from './atomData';
 
   function hasSelect(record) {
     return getAtomSelectKeys().includes(record.businessId);

src/views/mallResourceDevelopment/benchmark/benchmarkManagement/createLabel/index.vue

@@ -121,7 +121,7 @@
   import {
     createBodyFormSchema,
     createHeaderFormSchema,
-  } from '@/views/mallResourceDevelopment/label/labelDevelop/createLabel/create.data';
+  } from './create.data';
   import { reactive, ref } from 'vue';
   import { useRoute } from 'vue-router';
 

src/views/mallResourceDevelopment/benchmark/benchmarkManagement/labelDetail/infoModel.vue

@@ -21,7 +21,7 @@
   import { Input } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
-  import { infoFormSchema } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
+  import { infoFormSchema } from './detail.data';
 
   const isUpdate = ref(false);
   const getTitle = '基本信息';

src/views/mallResourceDevelopment/benchmark/benchmarkManagement/labelDetail/sensitiveWayModel.vue

@@ -44,8 +44,8 @@
     tabTableColumn,
     tabTableFormSchema,
   } from '@/views/mallResourceDevelopment/label/label.data';
-  import { sensitiveTableColumn } from '@/views/mallResourceDevelopment/label/labelDetail/detail.data';
-  import { columnTableData } from '@/views/mallResourceDevelopment/label/labelDetail/detailData';
+  import { sensitiveTableColumn } from './detail.data';
+  import { columnTableData } from './detailData';
   import BasicHelp from '@/components/Basic/src/BasicHelp.vue';
 
   const getTitle = '脱敏策略';

src/views/mallResourceDevelopment/dataSet/dataSetByApply/downloadModal.vue

+<template>
+  <BasicModal
+    width="55%"
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="title"
+    @ok="handleSubmit"
+  >
+    <BasicTable @register="registerTable" />
+  </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, useTable } from '@/components/Table';
+  import { downloadColumns } from './data';
+  import { downloadData } from './datasetByApplyData';
+
+  const emit = defineEmits(['success', 'register']);
+  const { createMessage } = useMessage();
+  const title = ref();
+  const tableData = ref([]);
+  //获取接口数据并放在下拉框里（这里是打开了一个弹框）
+  //初始化表单
+  const [registerTable, { reload }] = useTable({
+    title: '选择下载范围',
+    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 };
+    },
+    rowSelection: {
+      type: 'radio',
+    },
+    striped: false,
+    pagination: false,
+    columns: downloadColumns,
+    useSearchForm: false,
+    showTableSetting: false,
+    bordered: true,
+    showIndexColumn: false,
+  });
+  //初始化弹框
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await reload();
+    setModalProps({ confirmLoading: false });
+    title.value = data.title;
+  });
+
+  async function handleSubmit() {
+    closeModal();
+    createMessage.success('下载成功');
+  }
+  onMounted(() => {
+    tableData.value = downloadData;
+  });
+</script>

src/views/mallResourceDevelopment/dataSet/dataSetByApply/index.vue

@@ -154,7 +154,7 @@
 
   function handleDetail(record: Recordable) {
     router.push({
-      path: '/file/fileByApply/fileByApplyDetail',
+      path: '/dataset/datasetByApply/datasetByApplyDetail',
       query: {
         name: record.name,
       },

src/views/mallResourceDevelopment/dataSet/datasetByCreate/GroupTree.vue

 <template>
-  <div class="m-5 mr-0 overflow-hidden bg-white">
+  <div class=" overflow-hidden bg-white">
     <BasicTree
       title=""
       ref="treeRef"

src/views/mallResourceDevelopment/dataSet/datasetByCreate/addFileModal.vue

@@ -7,24 +7,23 @@
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm" />
-    <EditFileModal @register="registerEditFile" />
   </BasicModal>
 </template>
 <script lang="ts" setup>
   import { ref, unref } from 'vue';
-  import { BasicModal, useModal, useModalInner } from '@/components/Modal';
+  import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
   import { addFileFormSchema } from './data';
-  import { TreeData } from './dataFileData';
-  import EditFileModal from './editFileModal.vue';
+  import { newFileTreeData } from './dataFileData';
+  import { useMessage } from '@/hooks/web/useMessage';
 
   defineOptions({ name: 'AccountModal' });
 
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
   const title = ref();
+  const { createMessage } = useMessage();
 
-  const [registerEditFile, { openModal: openEditFileModal }] = useModal();
   //获取接口数据并放在下拉框里（这里是打开了一个弹框）
   //初始化表单
   const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
@@ -49,7 +48,7 @@
       });
     }
     title.value = data.title;
-    const treeList = handleTree(TreeData, 'businessId', undefined, undefined, undefined);
+    const treeList = handleTree(newFileTreeData, 'businessId', undefined, undefined, undefined);
     updateSchema([
       {
         field: 'path',
@@ -94,9 +93,7 @@
       const values = await validate();
       setModalProps({ confirmLoading: true });
       closeModal();
-      openEditFileModal(true, {
-        title: '编辑文件',
-      });
+      createMessage.success('新建成功');
     } finally {
       setModalProps({ confirmLoading: false });
     }

src/views/mallResourceDevelopment/dataSet/datasetByCreate/dataFileData.ts

-import { informationColumns } from '@/views/mallResourceDevelopment/dataSet/datasetByCreate/data';
 
 export const tableList: any[] = [
   {
@@ -457,3 +456,215 @@ export const basicOldData = {
   version: 'V9.0',
   source: '元数据',
 };
+export const newFileTreeData: any[] = [
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 100,
+    parentWorkSpaceName: '公共数据集',
+    workSpaceName: '公共数据集',
+    parentId: 0,
+    'code:': '001',
+    ancestors: '0',
+    orderNum: 0,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 101,
+    parentWorkSpaceName: '公共数据集',
+    workSpaceName: '党建建设',
+    parentId: 100,
+    'code:': '002',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 201,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '基本信息',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 202,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '党员发展计划',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 203,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '主题教育活动',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 204,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '党建工作总结',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 205,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '党史知识竞赛',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 206,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '红色文化展览',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 207,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '志愿服务活动',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 208,
+    parentWorkSpaceName: '党建建设',
+    workSpaceName: '党员风采展示',
+    parentId: 101,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 102,
+    parentWorkSpaceName: '公共数据集',
+    workSpaceName: '交通信息',
+    parentId: 100,
+    'code:': '004',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 209,
+    parentWorkSpaceName: '交通信息',
+    workSpaceName: '城市公交优化方案',
+    parentId: 102,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 210,
+    parentWorkSpaceName: '交通信息',
+    workSpaceName: '智能交通系统部署',
+    parentId: 102,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 211,
+    parentWorkSpaceName: '交通信息',
+    workSpaceName: '绿色出行倡议',
+    parentId: 102,
+    'code:': '003',
+    ancestors: '0,100',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+];

src/views/mallResourceDevelopment/dataSet/datasetByCreate/datasetByCreateDetail.vue

@@ -22,8 +22,8 @@
         </div>
         <div class="buttonGroup">
           <a-button type="primary" @click="handleVersionPublish">版本发布</a-button>
-          <a-button type="primary" @click="handleParameterConfiguration">版本管理</a-button>
-          <a-button type="primary" @click="handleVersionManagement">删除</a-button>
+          <a-button type="primary" @click="handleVersionManagement">版本管理</a-button>
+          <a-button type="primary" @click="handleDelete">删除</a-button>
           <a-button type="primary" @click="handleUp">上架</a-button>
           <a-button type="primary" @click="handleVersionManagement">编辑</a-button>
         </div>
@@ -178,7 +178,7 @@
 
   defineOptions({ name: 'AccountDetail' });
 
-  const { createMessage } = useMessage();
+  const { createMessage, createConfirm } = useMessage();
   const ATabs = Tabs;
   const ATabPane = Tabs.TabPane;
   const currentKey = ref('1');
@@ -256,6 +256,18 @@
       title: '申请发布V10.0版本：数据集1',
     });
   }
+  function handleDelete() {
+    createConfirm({
+      iconType: 'warning',
+      title: '确认删除',
+      content: '确认删除吗？',
+      onOk() {
+        router.back();
+        createMessage.success('删除成功!');
+      },
+    });
+  }
+
   function goBack() {
     router.back();
   }

src/views/mallResourceDevelopment/dataSet/datasetByCreate/editFileModal.vue

@@ -201,9 +201,8 @@
   }
 
   function handleSubmit() {
-    router.push({
-      path: '/dataset/datasetByCreate/datasetByCreateDetail',
-    });
+    closeModal();
+    createMessage.success('提交成功');
   }
 </script>
 <style lang="scss" scoped>

src/views/mallResourceDevelopment/dataSet/datasetByCreate/index.vue

 <template>
   <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
     <GroupTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
-    <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5">
-      <template #toolbar>
-        <a-button type="primary" @click="deleteButton">删除</a-button>
-        <a-button type="primary" @click="handleMove(1)">移动</a-button>
-        <a-button type="primary" @click="batchUploading">批量上架</a-button>
-        <a-button type="primary" @click="handleNewFolder">新建文件夹</a-button>
-        <a-button type="primary" @click="handleDataEntry">新建文件</a-button>
-      </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'status'">
-          <template v-if="record.uploadStatus === '0'">
-            <Icon icon="grommet-icons:status-good" color="green" /><span>已发布</span>
+    <div class="w-3/4 xl:w-4/5">
+      <div style="display: flex; align-items: center; background-color: white; padding-top: 20px">
+        <Icon style="margin-left: 30px" icon="ion:folder-outline" :size="50" :color="'#6499e9'" />
+        <div style="margin-left: 10px">
+          <span class="title">test</span>
+          <div>
+            <span class="path">我创建的</span>
+          </div>
+        </div>
+        <a-button style="margin-left: 550px" type="primary" @click="deleteButton">删除</a-button>
+        <a-button style="margin-left: 10px" type="primary" @click="handleMove(1)">移动</a-button>
+        <a-button style="margin-left: 10px" type="primary" @click="batchUploading"
+          >批量上架</a-button
+        >
+        <a-button style="margin-left: 10px" type="primary" @click="handleNewFolder"
+          >新建文件夹</a-button
+        >
+        <a-button style="margin-left: 10px" type="primary" @click="handleCataloging"
+          >新建编目</a-button
+        >
+        <a-button style="margin-left: 10px" type="primary" @click="handleDataEntry"
+          >新建文件</a-button
+        >
+        <a-button style="margin-left: 10px" type="primary" @click="handleDataEntry"
+          >批量新建</a-button
+        >
+      </div>
+      <BasicTable style="background-color: white" @register="registerTable">
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'status'">
+            <template v-if="record.uploadStatus === '0'">
+              <Icon icon="grommet-icons:status-good" color="green" /><span>已发布</span>
+            </template>
+            <template v-if="record.uploadStatus === '1'">
+              <Icon icon="carbon:error-outline" color="red" /><span>未发布</span>
+            </template>
           </template>
-          <template v-if="record.uploadStatus === '1'">
-            <Icon icon="carbon:error-outline" color="red" /><span>未发布</span>
+          <template v-if="column.key === 'uploadStatus'">
+            <template v-if="record.uploadStatus === '0'">
+              <Icon icon="grommet-icons:status-good" color="green" /><span>已上架</span>
+            </template>
+            <template v-if="record.uploadStatus === '1'">
+              <Icon icon="carbon:error-outline" color="red" /><span>未上架</span>
+            </template>
           </template>
-        </template>
-        <template v-if="column.key === 'uploadStatus'">
-          <template v-if="record.uploadStatus === '0'">
-            <Icon icon="grommet-icons:status-good" color="green" /><span>已上架</span>
+          <template v-if="column.key === 'name'">
+            <div @click="handleDetail" style="color: #6499e9">
+              <Icon icon="carbon:folder" />
+              <span>{{ record.name }}</span>
+            </div>
           </template>
-          <template v-if="record.uploadStatus === '1'">
-            <Icon icon="carbon:error-outline" color="red" /><span>未上架</span>
+          <template v-if="column.key === 'action'">
+            <TableAction
+              :actions="[
+                {
+                  label: '上架',
+                  popConfirm: {
+                    title: '是否确认删除',
+                    placement: 'left',
+                    confirm: handleUpload.bind(null),
+                  },
+                },
+                {
+                  label: '编辑',
+                  onClick: handEdit.bind(null),
+                },
+                {
+                  label: '删除',
+                  popConfirm: {
+                    title: '是否确认删除',
+                    placement: 'left',
+                    confirm: handDelete.bind(null),
+                  },
+                },
+              ]"
+            />
           </template>
         </template>
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                label: '上架',
-                onClick: handleUpload.bind(null, 0, record),
-              },
-              {
-                label: '删除',
-                onClick: handDelete.bind(null),
-              },
-            ]"
-          />
-        </template>
-      </template>
-    </BasicTable>
+      </BasicTable>
+    </div>
     <MoveFile @register="registerMoveFile" />
     <NewFolder @register="registerNewFolder" />
     <AddFileModal @register="registerAddFileModal" />
+    <EditFileModal @register="registerEditFile" />
   </PageWrapper>
 </template>
 <script lang="ts" setup>
@@ -60,11 +100,15 @@
   import GroupTree from './GroupTree.vue';
   import Icon from '@/components/Icon/Icon.vue';
   import AddFileModal from './addFileModal.vue';
+  import { router } from '@/router';
+  import EditFileModal from '@/views/mallResourceDevelopment/dataSet/datasetByCreate/editFileModal.vue';
 
   const { createMessage, createConfirm } = useMessage();
   const [registerMoveFile, { openModal: openMoveFileModal }] = useModal();
   const [registerNewFolder, { openModal: openNewFolderModal }] = useModal();
   const [registerAddFileModal, { openModal: openAddFileModal }] = useModal();
+  const [registerEditFile, { openModal: openEditFileModal }] = useModal();
+
   const [registerTable, { reload, getRowSelection }] = useTable({
     api: async () => {
       const response = {
@@ -94,7 +138,7 @@
       return info;
     },
     actionColumn: {
-      width: 100,
+      width: 120,
       title: '操作',
       dataIndex: 'action',
     },
@@ -111,12 +155,15 @@
       isUpdate: false,
     });
   }
+  function handleCataloging() {
+    openNewFolderModal(true, {
+      isUpdate: true,
+    });
+  }
 
   /** 移动按钮*/
-  function handleMove(isMove, record: Recordable) {
-    // console.log('record',record)
+  function handleMove(isMove) {
     openMoveFileModal(true, {
-      record,
       isMove: isMove,
     });
   }
@@ -151,7 +198,16 @@
       },
     });
   }
-
+  function handleDetail() {
+    router.push({
+      path: '/dataset/datasetByCreate/datasetByCreateDetail',
+    });
+  }
+  function handEdit() {
+    openEditFileModal(true, {
+      title: '编辑文件',
+    });
+  }
   /** 部门树的select*/
   function handleSelect() {
     reload();
@@ -159,3 +215,13 @@
 
   onMounted(() => {});
 </script>
+<style scoped>
+  .title {
+    font-size: 16px;
+    font-weight: 500;
+  }
+  .path {
+    font-size: 14px;
+    color: gray;
+  }
+</style>

src/views/mallResourceDevelopment/dataSet/datasetByCreate/newFolder.vue

@@ -85,7 +85,7 @@
     return treeData !== '' ? treeData : data;
   }
 
-  const getTitle = computed(() => (!unref(isUpdate) ? '新建主体' : '编辑主体'));
+  const getTitle = computed(() => (!unref(isUpdate) ? '新建文件夹' : '新建编目'));
 
   async function handleSubmit() {
     try {

src/views/mallResourceDevelopment/file/fileByApply/downloadModal.vue

@@ -60,7 +60,7 @@
 
   async function handleSubmit() {
     closeModal();
-    createMessage.success('提交成功');
+    createMessage.success('下载成功');
   }
   onMounted(() => {
     tableData.value = downloadData;

src/views/mallResourceDevelopment/file/fileByApply/fileByApplyDetail.vue

@@ -170,7 +170,6 @@
     BasicInfoSchema,
     dataRangeColumns,
     dataRangeSchema,
-    infoBasicSchema,
     infoColumns,
     infoDataColumns,
     ManagePropertySchema,

src/views/scriptDevelopment/functionManagement/index.vue

@@ -198,3 +198,13 @@
     console.log('选择节点selectedDeptId:', deptId);
   };
 </script>
+<style scoped>
+.title {
+  font-size: 16px;
+  font-weight: 500;
+}
+.path {
+  font-size: 14px;
+  color: gray;
+}
+</style>

src/views/scriptDevelopment/selfServiceTableCreation/index.vue

@@ -204,3 +204,13 @@
     console.log('选择节点selectedDeptId:', deptId);
   };
 </script>
+<style scoped>
+  .title {
+    font-size: 16px;
+    font-weight: 500;
+  }
+  .path {
+    font-size: 14px;
+    color: gray;
+  }
+</style>

src/views/scriptDevelopment/sqlDevelopment/importModal/importModal.vue

@@ -13,9 +13,6 @@
             <a-button>下载模板</a-button>
             <a-button type="primary" style="margin-left: 5px">选择文件</a-button>
           </div>
-          <div style="width: 200px; margin-top: 6px; margin-left: 5px"
-            >数据质量只能导入单个zip文件</div
-          >
         </div>
       </template>
     </BasicForm>

src/views/scriptDevelopment/sqlDevelopment/importModal/tempalte.data.ts

-import { getAllRoleList } from '@/api/system/role/role';
-import { BasicColumn, FormSchema } from '@/components/Table';
-
-export const columns: BasicColumn[] = [
-  {
-    title: '名称',
-    dataIndex: 'name',
-    width: 120,
-    slots: { customRender: 'name' },
-  },
-  {
-    title: '数据源',
-    dataIndex: 'dataSource',
-    slots: { customRender: 'dataSource' },
-    width: 150,
-  },
-  {
-    title: '模板编号',
-    dataIndex: 'templateNumber',
-    width: 120,
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 150,
-  },
-  {
-    title: '更新时间',
-    dataIndex: 'updateTime',
-    width: 150,
-  },
-  {
-    title: '拥有者',
-    dataIndex: 'owner',
-    width: 100,
-  },
-  {
-    title: '权属工作组',
-    dataIndex: 'workgroup',
-    width: 120,
-  },
-];
-
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'name',
-    label: ' ',
-    component: 'Input',
-    colProps: { span: 8 },
-    componentProps: {
-      placeholder: '输入关键字搜索',
-    },
-  },
-];
-
-/**移动*/
-export const MoveFormSchema: any[] = [
+export const importFormSchema: any[] = [
   {
-    field: 'taskId',
-    label: '路径',
+    field: 'deptId',
+    label: '导入至',
     component: 'TreeSelect',
     colProps: { lg: 24, md: 24 },
-    componentProps: {
-      // border: 'none',
-      fieldNames: {
-        label: 'QualityName',
-        value: 'businessId',
-      },
-      getPopupContainer: () => document.body,
-    },
-    required: true,
-  },
-];
-
-export const formSchemaNewFolder: any = [
-  {
-    field: 'path',
-    label: '路径',
-    component: 'TreeSelect',
-    rules: [
-      {
-        required: true,
-        message: '请选择上级菜单',
-      },
-    ],
     componentProps: {
       fieldNames: {
-        label: 'QualityName',
+        label: 'deptName',
         value: 'businessId',
       },
-      getPopupContainer: () => document.body,
-    },
-  },
-
-  {
-    field: 'name',
-    label: '文件夹名称',
-    component: 'Input',
-    colProps: { span: 8 },
-    componentProps: {
-      placeholder: '输入文件夹名称',
-    },
-  },
-  {
-    field: 'fileType',
-    label: '权限模式',
-    component: 'RadioGroup',
-    defaultValue: '本级定义',
-    colProps: { span: 8 },
-    componentProps: {
-      options: [
-        { label: '本级定义', value: '本级定义' },
-        { label: '资源自定义', value: '资源自定义' },
+      treeData: [
+        {
+          deptName: '个人工作组',
+          businessId: '1',
+          children: [
+            {
+              deptName: '个人工作区',
+              businessId: '11',
+              children: [
+                {
+                  deptName: '图标验收',
+                  businessId: '111',
+                },
+              ],
+            },
+            {
+              deptName: '共享工作区',
+              businessId: '12',
+              children: [
+                {
+                  deptName: '学生成绩',
+                  businessId: '122',
+                },
+              ],
+            },
+          ],
+        },
       ],
-      placeholder: '输入描述',
-    },
-  },
-  {
-    field: 'group',
-    label: '权属工作组',
-    component: 'Select',
-    defaultValue: '默认工作组',
-    colProps: { span: 8 },
-    componentProps: {
-      placeholder: '输入描述',
-      options: [{ label: '默认工作组', value: '默认工作组' }],
-    },
-  },
-];
-
-export const formSchemaTemplate: any = [
-  {
-    field: 'path',
-    label: '路径',
-    component: 'TreeSelect',
-    rules: [
-      {
-        required: true,
-        message: '请选择上级菜单',
-      },
-    ],
-    componentProps: {
-      fieldNames: {
-        label: 'QualityName',
-        value: 'businessId',
-      },
-      getPopupContainer: () => document.body,
-    },
-  },
-
-  {
-    field: 'name',
-    label: '文件名称',
-    component: 'Input',
-    colProps: { span: 8 },
-    componentProps: {
-      placeholder: '输入文件夹名称',
     },
     required: true,
   },
-  {
-    field: 'fileType',
-    label: '文件类型',
-    component: 'Input',
-    defaultValue: '质量模板',
-    colProps: { span: 8 },
-    componentProps: {
-      readonly: true,
-      style: {
-        border: 'none',
-        backgroundColor: 'transparent',
-      },
-    },
-  },
-  {
-    field: 'dataSource',
-    label: '支持数据源',
-    component: 'Select',
-    colProps: { span: 8 },
-    componentProps: {
-      mode: 'multiple',
-      options: [
-        { label: 'INCEPTOR', value: 'INCEPTOR' },
-        { label: 'IMPALA', value: 'IMPALA' },
-        { label: 'MYSQL', value: 'MYSQL' },
-      ],
-    },
-    required: true,
-  },
-  {
-    field: 'model',
-    label: '目录权属模式',
-    component: 'RadioGroup',
-    defaultValue: '本级定义',
-    colProps: { span: 8 },
-    componentProps: {
-      options: [
-        { label: '本级定义', value: '本级定义' },
-        { label: '资源自定义', value: '资源自定义' },
-      ],
-    },
-  },
-  {
-    field: 'group',
-    label: '权属工作组',
-    component: 'Select',
-    defaultValue: '默认工作组',
-    colProps: { span: 8 },
-    componentProps: {
-      placeholder: '输入描述',
-      options: [{ label: '默认工作组', value: '默认工作组' }],
-    },
-  },
-];
-export const importFormSchema: any[] = [
   {
     field: 'fileMethods',
     label: '导入文件选择',
     slot: 'fileMethods',
-    colProps: { lg: 24, md: 24, offset: 3 },
+    colProps: { lg: 24, md: 24 },
   },
   {
     field: 'fileRename',
     label: '文件重名',
     component: 'RadioGroup',
     required: true,
-    colProps: { lg: 24, md: 24, offset: 3 },
+    colProps: { lg: 24, md: 24 },
     componentProps: {
       options: [
         { label: '全部放弃', value: '1' },