update:表单校验bug

src/components/common/table/tableForm.vue

@@ -65,7 +65,7 @@ const getHeadDataFun = () => {
       const data = JSON.parse(res.data.formConfig);
       const rulesObj: any = {};
       data.forEach((item: any) => {
-        if (item.validate) {
+        if (item.validate && item.inForm) {
           rulesObj[item.key] = [];
           item.validate.forEach((rule: any) => {
             if (rule === 'required') {

src/router/index.ts

@@ -1,8 +1,8 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import { CommonStore } from '@/stores/common';
 import EmptyLayout from '@/layouts/empty.vue';
-import DefaultLayout from '@/layouts/default.vue';
+// import DefaultLayout from '@/layouts/default.vue';
-// import EmptyLayout from '@/layouts/cid.vue';
+import CidLayout from '@/layouts/cid.vue';
 import routerData from '@/router/routerData';
 
 const router = createRouter({
@@ -21,7 +21,7 @@ const router = createRouter({
     },
     {
       path: '/',
-      component: DefaultLayout,
+      component: CidLayout,
       children: routerData,
     },
     {

src/views/data/overview/index.vue

@@ -62,7 +62,11 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item @click="openAddDirFun">新建文件夹</el-dropdown-item>
-                      <el-dropdown-item>上传文件</el-dropdown-item>
+                      <el-dropdown-item>
+                        <el-upload :show-file-list="false" :before-upload="beforeUploadFun">
+                          上传文件
+                        </el-upload>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
@@ -73,6 +77,14 @@
                 <el-button :icon="Search" @click="searchShow = true">搜索</el-button>
               </div>
             </template>
+            <template #originalName="{ row }">
+              <div class="file-name" @dblclick="goDetailFun(row)">
+                <el-icon :size="16">
+                  <MessageBox />
+                </el-icon>
+                <el-link type="primary" class="name">{{ row.originalName }}</el-link>
+              </div>
+            </template>
           </BaseTable>
         </template>
       </FileTree>
@@ -116,7 +128,7 @@
 import { ref, onMounted } from 'vue';
 import FileTree from '@/components/common/fileTreeTemp/index.vue';
 import { getSimulationNodeTreeApi, getAllTemplateApi } from '@/api/data/dimensionTemplate';
-import { dataQueryDirApi } from '@/api/data/data';
+import { dataQueryDirApi, dataDelDirApi, dataUploadFilesApi } from '@/api/data/data';
 import BaseTable from '@/components/common/table/baseTable.vue';
 import Configuration from './components/configuration.vue';
 import FileSearch from './components/search.vue';
@@ -173,6 +185,40 @@ const delFun = () => {
     ElMessage.warning('请选择要删除的数据');
     return;
   }
+  console.log(chosenData);
+  const proList: any[] = [];
+  chosenData.forEach((item: any) => {
+    proList.push(dataDelDirApi({ delDirId: item.id }));
+  });
+  Promise.all(proList).then((res: any) => {
+    console.log(res);
+  });
+  // const params = {
+  //   delDirId: '',
+  // };
+  // dataDelDirApi(params).then((res: any) => {
+  //   console.log(res);
+  // });
+};
+
+const beforeUploadFun = (file: any) => {
+  if (!currentData.value) {
+    ElMessage.warning('请选择一个目录');
+    return;
+  }
+  const { name } = file;
+  const params = {
+    fileName: name,
+    dirId: currentData.value.id,
+    file: file,
+  };
+  dataUploadFilesApi(params).then((res: any) => {
+    console.log(res);
+    if (res.code === 200) {
+      ElMessage.success('上传成功');
+    }
+  });
+  return false;
 };
 
 const openNodeFun = () => {
@@ -191,6 +237,12 @@ const openAddDirFun = () => {
   addDirShow.value = true;
 };
 
+const goDetailFun = (data: any) => {
+  if (FileTreeRef.value) {
+    FileTreeRef.value.openDirFun(data.id);
+  }
+};
+
 const choseNodeFun = (data: any) => {
   currentData.value = data;
 };
@@ -227,5 +279,13 @@ const reloadFun = () => {
   .option-btn {
     margin-right: 12px;
   }
+  .file-name {
+    display: flex;
+    align-items: center;
+    color: var(--el-color-primary);
+    .name {
+      padding-left: 4px;
+    }
+  }
 }
 </style>