Merge remote-tracking branch 'origin/master'

src/views/dataWarehousePlanning/logicalModel/index.vue

@@ -16,7 +16,12 @@
           @click="handleWaitUpload"
           >设为待发布</a-button
         >
-        <a-button type="primary" :disabled="getRowSelection().selectedRowKeys <= 0" @click="handleUpload">发布</a-button>
+        <a-button
+          type="primary"
+          :disabled="getRowSelection().selectedRowKeys <= 0"
+          @click="handleUpload"
+          >发布</a-button
+        >
         <a-button type="primary" @click="handleImport">导入</a-button>
         <a-button
           type="primary"
@@ -222,6 +227,10 @@
     });
   }
 
+  // 导出
+  function handleExport() {
+    createMessage.success('导出成功！');
+  }
   /** 删除按钮*/
   function handleDelete() {
     createConfirm({

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

@@ -4,6 +4,7 @@ import { h } from 'vue';
 import { Tag, Switch } from 'ant-design-vue';
 import { useMessage } from '@/hooks/web/useMessage';
 import { changeFlagApi } from '@/api/system/user/user';
+import {TreeData} from "@/views/dataWarehousePlanning/logicalModel/modelData";
 // 引入开关组件
 type CheckedType = boolean | string | number;
 
@@ -78,10 +79,10 @@ export const modelFormSchema: any[] = [
     colProps: { lg: 24, md: 24 },
     componentProps: {
       fieldNames: {
-        label: 'modelName',
-        value: 'businessId',
+        label: 'title',
+        value: 'key',
       },
-      getPopupContainer: () => document.body,
+      treeData: TreeData,
     },
   },
   {

src/views/dataWarehousePlanning/logicalModel/modelModal.vue

@@ -14,20 +14,14 @@
   import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
   import { modelFormSchema } from './model.data';
-  import { useMessage } from '@/hooks/web/useMessage';
-  import { TreeData } from '@/views/dataWarehousePlanning/logicalModel/modelData';
   import { router } from '@/router';
 
-  defineOptions({ name: 'ModelModal' });
-
-  const emit = defineEmits(['success', 'register']);
-  const { createMessage } = useMessage();
   const isUpdate = ref(true);
   const isMove = ref(false);
   const rowId = ref('');
   //获取接口数据并放在下拉框里（这里是打开了一个弹框）
   //初始化表单
-  const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
+  const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
     labelWidth: 100,
     baseColProps: { lg: 12, md: 24 },
     schemas: modelFormSchema,
@@ -38,7 +32,7 @@
   });
   //初始化弹框
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    resetFields();
+    await resetFields();
     setModalProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
     isMove.value = !!data?.isMove;
@@ -46,61 +40,21 @@
       // 获取行数据的id
       rowId.value = data.record.businessId;
       // 塞值
-      setFieldsValue({
+      await setFieldsValue({
         ...data.record,
       });
     }
 
-    const treeList = handleTree(TreeData, 'businessId', undefined, undefined, undefined);
-    console.log('treeList', treeList);
-    updateSchema([
-      {
-        field: 'modelId',
-        componentProps: {
-          treeData: treeList,
-        },
-      },
-    ]);
   });
 
   const getTitle = computed(() => '新建文件');
-
-  function handleTree(data, id, parentId, children, rootId) {
-    id = id || 'id';
-    parentId = parentId || 'parentId';
-    children = children || 'children';
-    rootId =
-      rootId ||
-      Math.min.apply(
-        Math,
-        data.map((item) => {
-          return item[parentId];
-        }),
-      ) ||
-      0;
-    // 对源数据深度克隆
-    const cloneData = JSON.parse(JSON.stringify(data));
-    // 循环所有项
-    const treeData = cloneData.filter((father) => {
-      const branchArr = cloneData.filter((child) => {
-        // 返回每一项的子级数组
-        return father[id] === child[parentId];
-      });
-      branchArr.length > 0 ? (father.children = branchArr) : '';
-      // 返回第一层
-      return father[parentId] === rootId;
-    });
-    return treeData !== '' ? treeData : data;
-  }
-
   /**确定按钮*/
   async function handleSubmit() {
-    const values = await validate();
-    router.push({
+    await validate();
+    await router.push({
       path: '/metaModel/knowledgeModel/EditRowTable',
       query: {},
     });
-
     closeModal();
   }
 </script>