修改文件

src/views/ArchitecturePlan/theme/index.vue

@@ -100,7 +100,7 @@
         data: [],
       };
       var data = [];
-      var data = [];
+
       data = tableData.value.filter((item) => item.businessId !== 100);
       return { ...response, data: data };
     },

src/views/auditLog/audiModal.vue

 <template>
   <BasicModal
+    width="40%"
     v-bind="$attrs"
-    width="45%"
-    height="500"
     @register="registerModal"
     :title="getTitle"
     @ok="handleSubmit"
   >
-    <div class="modal-content">
-      <!-- <div class="table-container">
-        <BasicTable @register="registerTable">
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'action'">
-              <TableAction
-                :actions="[
-                  {
-                    label: '编辑',
-                    onClick: handleEdit.bind(null, record),
-                  },
-                ]"
-              />
-            </template>
-          </template>
-        </BasicTable>
-      </div> -->
-      <div class="form-container">
-        <BasicForm @register="registerForm">
-          <template #menu="{ model, field }">
-            <BasicTree
-              v-model:value="model[field]"
-              :treeData="treeDataList"
-              :fieldNames="{ title: 'label', key: 'id' }"
-              checkable
-              toolbar
-            />
-          </template>
-        </BasicForm>
-      </div>
-    </div>
+    <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
-<script setup lang="ts">
-  import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { useModalInner } from '@/components/Modal';
-  import BasicModal from '@/components/Modal/src/BasicModal.vue';
-  import { ref, unref } from 'vue';
-  import { Table } from 'ant-design-vue';
-  import { ModelFormSchema, columns } from '@/views/auditLog/audiModal.data';
-  import { addDataScopeApi, getRoleDeptTreeSelect, roleDetailApi } from '@/api/system/role/role';
+<script lang="ts" setup>
+  import { ref, computed, unref, reactive } from 'vue';
+  import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
-  import { getMenuListByPage, getMenuSelect, getRoleMenuSelectedMC } from '@/api/system/menu/menu';
+  import { ModelFormSchema } from './audiModal.data';
+  import { getDeptList } from '@/api/system/dept/dept';
+  import { addUserApi, UserDetailApi, UserUpdataApi } from '@/api/system/user/user';
+  import { encryptTwo } from '../../../../src/utils/jsencrypt.js';
   import { useMessage } from '@/hooks/web/useMessage';
-  import { BasicTree, TreeItem } from '@/components/Tree';
+  import { tableListtab1 } from './mock';
+  import { router } from '@/router';
+
+  defineOptions({ name: 'ModelModal' });
 
-  defineOptions({ name: 'RoleModal' });
-  const loadingRef = ref(false);
-  // 列表
-  const dataSource = ref([]);
-  const treeData = ref();
-  const roleId = ref();
-  const isPermiss = ref(true);
-  const getTitle = ref('查看日志');
-  const { createMessage } = useMessage();
   const emit = defineEmits(['success', 'register']);
-  const formData = ref({});
-  const treeDataList = ref<TreeItem[]>([]);
+  const { createMessage } = useMessage();
+  const isUpdate = ref(true);
+  const isMove = ref(false);
+  const rowId = ref('');
+  //获取接口数据并放在下拉框里（这里是打开了一个弹框）
+  //初始化表单
+  const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
+    labelWidth: 100,
 
-  const [registerTable, { reload, getForm }] = useTable({
-    // api: async (params) => {
-    //   const param = {
-    //     businessId: roleId.value,
-    //   };
-    //   const response = await getRoleMenuSelectedMC(param);
-    //   //进行处理数据
-    //   const transformedData = transformData(response.data); // 定义一个函数transformData来做你需要的数据转换
-    //   return { ...response, data: transformedData };
-    // },
-    columns,
-    useSearchForm: false,
-    showTableSetting: false,
-    bordered: true,
-    isTreeTable: true,
-    pagination: false,
-    showIndexColumn: false,
-    actionColumn: {
-      width: 50,
-      title: '操作',
-      dataIndex: 'action',
-      fixed: undefined,
+    schemas: ModelFormSchema,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 23,
     },
   });
-
-  const [registerModal, { closeModal, setModalProps }] = useModalInner(async (data) => {
-    isPermiss.value = data.record.isPermiss;
-    roleId.value = data.record.businessId;
-    roleDetailApi(roleId.value).then((res) => {
-      formData.value = res.data;
-      const form = {
-        roleName: res.data.roleName,
-      };
+  //初始化弹框
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    resetFields();
+    setModalProps({ confirmLoading: false });
+    isUpdate.value = !!data?.isUpdate;
+    isMove.value = !!data?.isMove;
+    if (unref(isUpdate)) {
+      // 获取行数据的id
+      rowId.value = data.record.businessId;
+      // 塞值
       setFieldsValue({
-        ...form,
+        ...data.record,
       });
-    });
-    if (unref(treeDataList).length === 0) {
-      const treeRes = await getMenuSelect();
-      treeDataList.value = treeRes.data as any as TreeItem[];
     }
 
-    //控制
-    updateSchema({
-      field: 'dataScope',
-      componentProps: {
-        onChange: (value: any, option: any, form: any) => {
-          //调用接口 返回的参数赋值给dictValue
-          if (value === '2') {
-            updateSchema({
-              field: 'menuIds',
-              ifShow: true,
-              rules: [
-                {
-                  required: true,
-                  message: '请选择数据权限',
-                },
-              ],
-            });
-          } else {
-            updateSchema({
-              field: 'menuIds',
-              ifShow: false,
-              rules: [
-                {
-                  required: false,
-                },
-              ],
-            });
-          }
-        },
-      },
-    });
-    reload();
+    // const treeList = handleTree(TableData, 'businessId', undefined, undefined, undefined);
+    // console.log('treeList', treeList);
+    // updateSchema([
+    //   {
+    //     field: 'modelId',
+    //     componentProps: {
+    //       tableData: treeList,
+    //     },
+    //   },
+    // ]);
   });
 
-  //初始化表单
-  const [registerForm, { setFieldsValue, updateSchema, resetFields, validate, getFieldsValue }] =
-    useForm({
-      labelWidth: 100,
-      schemas: ModelFormSchema,
-      showActionButtonGroup: false,
-    });
+  const getTitle = computed(() => (!unref(isUpdate) ? '查看日志' : '查看日志'));
 
-  /**编辑按钮*/
-  function handleEdit(record: Recordable) {
-    formData.value.menuId = record.businessId;
-    formData.value.menuName = record.menuName;
-    const form = {
-      menuName: record.menuName,
-    };
-    setFieldsValue({
-      ...form,
-    });
-    const params = {
-      menuId: formData.value.menuId,
-      roleId: formData.value.businessId,
-    };
-    getRoleDeptTreeSelect(params).then((res) => {
-      formData.value.deptCheckStrictly = res.data.deptCheckStrictly;
-    });
-  }
-
-  /**改变列表结构 列表->树*/
-  function transformData(data) {
-    treeData.value = handleTree(data, 'businessId', undefined, undefined, undefined);
-    return treeData.value;
-  }
-
-  /**结构转换方法*/
   function handleTree(data, id, parentId, children, rootId) {
     id = id || 'id';
     parentId = parentId || 'parentId';
@@ -204,42 +96,14 @@
     return treeData !== '' ? treeData : data;
   }
 
-  /**确认按钮*/
+  /**确定按钮*/
   async function handleSubmit() {
-    try {
-      const values = await validate();
-      console.log('values:', values);
-      setModalProps({ confirmLoading: true });
-      formData.value.code = values.dataScope;
-      formData.value.menuIds = values.menuIds;
-      formData.value.deptIdList = '';
-      formData.value.roleId = '';
-      addDataScopeApi(formData.value).then((res) => {
-        if (res.code === 200) {
-          createMessage.success('新增成功');
-          closeModal();
-          emit('success', { isUpdate: unref(isPermiss), values: { ...values } });
-        }
-      });
-      reload();
-    } finally {
-      setModalProps({ confirmLoading: false });
-    }
-  }
-</script>
-<style scoped lang="less">
-  .modal-content {
-    display: flex;
-    height: 100%; // 可以根据需要调整高度
-
-    .table-container,
-    .form-container {
-      flex: 1; // 每个容器占据一半的空间
-      overflow: auto; // 如果内容超出容器高度，则显示滚动条
-    }
+    const values = await validate();
+    // router.push({
+    //   path: '/metaModel/physicsModel/EditRowTable',
+    //   query: {},
+    // });
 
-    .table-container {
-      border-right: 1px solid #e9ecef; // 可选：在表格和表单之间添加分隔线
-    }
+    closeModal();
   }
-</style>
+</script>

src/views/notifications/noticeManage/index.vue

@@ -196,6 +196,7 @@
   /***新增规则按钮*/
   function handleCreate() {
     openModalNew(true, {
+      isView: false,
       isUpdate: false,
     });
     console.log(isUpdate, '11');
@@ -211,6 +212,7 @@
   const handleViewDetail = (record: Recordable) => {
     openModalNew(true, {
       record,
+      isView: true,
       isUpdate: true,
     });
   };
@@ -233,6 +235,7 @@
   function handleEdit(record: Recordable) {
     openModalNew(true, {
       record,
+      isView: false,
       isUpdate: true,
     });
   }

src/views/notifications/noticeManage/notiModalNew.vue

@@ -11,50 +11,42 @@
 </template>
 <script lang="ts" setup>
   import { ref, computed, unref, reactive } from 'vue';
+  import { BasicModal, useModalInner } from '@/components/Modal';
   import { BasicForm, useForm } from '@/components/Form';
   import { formSchema } from './noti.data';
-  import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
-  import { BasicTree, TreeItem } from '@/components/Tree';
-  import { roleDetailApi, roleUpdataApi, addRoleApi } from '@/api/system/role/role';
-  import { getMenuSelect, getRoleMenuSelected } from '@/api/system/menu/menu';
-  import { encryptTwo } from '@/utils/jsencrypt';
-  import { useMessage } from '@/hooks/web/useMessage';
-  import { BasicModal, useModalInner } from '@/components/Modal';
   import { getDeptList } from '@/api/system/dept/dept';
   import { addUserApi, UserDetailApi, UserUpdataApi } from '@/api/system/user/user';
-  import { tableListtab1 } from '@/views/notifications/noticeManage/mock';
+  import { encryptTwo } from '../../../../src/utils/jsencrypt.js';
+  import { useMessage } from '@/hooks/web/useMessage';
+  import { TableData } from './mock';
   import { router } from '@/router';
 
-  const getTitle = computed(() => (!unref(isUpdate) ? '新建通知规则' : '编辑通知规则'));
+  defineOptions({ name: 'ModelModal' });
 
   const emit = defineEmits(['success', 'register']);
   const { createMessage } = useMessage();
-  const isUpdate = ref(false);
+  const isUpdate = ref(true);
+  const isView = ref(false);
   const isMove = ref(false);
   const rowId = ref('');
-  const roleId = ref('');
-  const treeData = ref<TreeItem[]>([]);
-  async function handleSubmit() {
-    const values = await validate();
-    router.push({
-      path: '/notifications/noticeManage',
-      query: {},
-    });
+  //获取接口数据并放在下拉框里（这里是打开了一个弹框）
+  //初始化表单
+  const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
+    labelWidth: 100,
 
-    closeModal();
-  }
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
-    labelWidth: 90,
-    baseColProps: { span: 24 },
     schemas: formSchema,
     showActionButtonGroup: false,
+    actionColOptions: {
+      span: 23,
+    },
   });
+  //初始化弹框
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     resetFields();
     setModalProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
     isMove.value = !!data?.isMove;
-    if (unref(isUpdate) && data.record) {
+    if (unref(isUpdate)) {
       // 获取行数据的id
       rowId.value = data.record.businessId;
       // 塞值
@@ -62,5 +54,66 @@
         ...data.record,
       });
     }
+
+    // const treeList = handleTree(TableData, 'businessId', undefined, undefined, undefined);
+    // console.log('treeList', treeList);
+    // updateSchema([
+    //   {
+    //     field: 'modelId',
+    //     componentProps: {
+    //       tableData: treeList,
+    //     },
+    //   },
+    // ]);
   });
+
+  // eslint-disable-next-line vue/return-in-computed-property
+  const getTitle = computed(() => {
+    if (unref(isView) && unref(isUpdate)) {
+      return '查看通知详情';
+    } else if (unref(isUpdate)) {
+      return '编辑通知详情';
+    } else if (!unref(isView) && !unref(isUpdate)) {
+      return '新增通知详情';
+    }
+  });
+
+  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({
+    //   path: '/metaModel/physicsModel/EditRowTable',
+    //   query: {},
+    // });
+
+    closeModal();
+  }
 </script>