@utogether/udp-core 1.0.1-beta.1 → 1.0.1-beta.2

package/src/views/system/menu/SystemMenu.vue

@@ -1,197 +1,197 @@
-<template>
-  <div class="page-content">
-    <ut-grid
-      ref="xgrid"
-      :tree-config="{
-        childrenField: 'children',
-        lazy: true,
-        hasChild: 'hasChildren',
-        loadMethod: loadChildrenMethod,
-        iconOpen: 'ri-checkbox-indeterminate-line ri-lg',
-        iconClose: 'ri-add-box-line ri-lg'
-      }"
-      :columns="columns"
-      :url="url"
-      :stripe="false"
-      mode="form"
-      @toolbarButtonClick="handleToolClick"
-    />
-    <MenuInfo
-      :show="data.showDrawer"
-      :record="data.record"
-      :data-status="data.dataStatus"
-      @close="onClose"
-    />
-    <AuthorityPanel :show="data.showAuthority" :record="data.record" @close="onClose" />
-  </div>
-</template>
-
-<script lang="tsx">
-export default { name: 'SystemMenu' };
-</script>
-<script setup lang="tsx">
-import { useI18n } from 'vue-i18n';
-import { ref, reactive } from 'vue';
-import MenuInfo from './menuInfo.vue';
-import AuthorityPanel from './AuthorityPanel.vue';
-import { clone } from 'xe-utils';
-import to from 'await-to-js';
-import { VxeUI } from 'vxe-pc-ui';
-import { useRender } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-const data = reactive<IRecord>({
-  record: {},
-  dataList: [],
-  submitLoading: false,
-  showDrawer: false,
-  dataStatus: '',
-  total: 0,
-  listQuery: {
-    pageSize: 10,
-    pageNum: 1
-  }
-});
-
-const { t } = useI18n();
-
-const renderHook = useRender();
-
-const serviceApi = getServiceApi();
-
-const xgrid = ref(null);
-
-const url = '/uums/menu';
-
-let row;
-
-// const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
-
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'menuName', width: 180, treeNode: true },
-  { field: 'menuNameEn', width: 140 },
-  { field: 'sort', width: 70 },
-  { field: 'menuCode', width: 140 },
-  { field: 'permissionCode', minWidth: 180 },
-  {
-    field: 'menuCategory',
-    title: 'message.menuType',
-    formatter: ['formatDict', 'SU.MENU.TYPE'],
-    width: 100
-  },
-  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleUpdate) },
-  {
-    field: 'operate',
-    width: 140,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        const type = row.menuType;
-        const addCmp = (
-          <ut-button status="u-cyan" icon="ri-add-fill" content="add" onTap={() => handleAdd(row)} />
-        );
-        const authCmp = (
-          <ut-button icon="ri-lock-fill" content="auth" onTap={() => handleAuthorityPanel(row)} />
-        );
-        return [
-          <>
-            {!type ? (
-              <>
-                <ut-button
-                  status="success"
-                  icon="ri-edit-box-line"
-                  content="edit"
-                  onTap={() => handleEdit(row)}
-                />
-                {['0', '5'].includes(row.menuCategory) ? addCmp : authCmp}
-              </>
-            ) : null}
-          </>
-        ];
-      }
-    }
-  }
-];
-
-// const resetListQuery = () => {
-//   data.listQuery.pageSize = 99;
-//   data.listQuery.pageNum = 1;
-//   getDataList();
-// };
-
-// const getDataList = async () => {
-//   const res = (await serviceApi('sys/listMenus', data.listQuery)) as IResponseData;
-//   data.dataList = res.list;
-//   data.total = res.total;
-// };
-
-const handleToolClick = ({ code }) => {
-  code === 'add' && handleAdd();
-  code === 'del' && handleDel();
-};
-
-// 异步加载子节点
-const loadChildrenMethod = async ({ row }: any) => {
-  const data = (await serviceApi.get(url, { parentId: row.id })) as IResponseData;
-  return new Promise(resolve => {
-    resolve(data.list);
-  });
-};
-
-// 新增子类型
-// menuType:保持原有不懂， 0:菜单 1，数据权限
-// 新增menuCategory: 0、根目录 1、菜单 2、内部链接3、外部链接
-const handleAdd = (record?: IRecord) => {
-  data.showDrawer = true;
-  data.dataStatus = 'add';
-  data.record.dispalyCode = record?.permissionCode; // 前缀
-  data.record.permissionCode = record?.permissionCode;
-  // data.record.menuType = !record || !record.parentId ? '0' : '1';
-  data.record.menuType = '0';
-  data.record.menuCategory = !record ? '0' : '';
-  data.record.parentId = record?.id;
-  data.record.hasChildren = record?.hasChildren;
-  data.record.children = data.record.children || [];
-  console.log(data.record);
-  row = record;
-};
-
-// 编辑
-const handleEdit = (record: IRecord) => {
-  data.showDrawer = true;
-  data.dataStatus = 'update';
-  data.record = clone(record, true);
-  data.record.menuType = data.record.menuType.toString();
-  data.record.dispalyCode = record.permissionCode;
-};
-
-// 启用/禁用
-async function handleUpdate({ row }) {
-  await serviceApi.put(url, [row]);
-  xgrid.value.refreshData();
-}
-// 删除
-const handleDel = async () => {
-  const type = await VxeUI.modal.confirm(t('message.delRecord'));
-  const records = xgrid.value.getInstance().getCheckboxRecords();
-  if (type === 'confirm') {
-    const [err] = await to(serviceApi.delete(url, records));
-  }
-};
-
-const handleAuthorityPanel = record => {
-  data.showAuthority = true;
-  data.dataStatus = 'update';
-  data.record = clone(record, true);
-  data.record.menuType = data.record.menuType.toString();
-  data.record.dispalyCode = record.permissionCode;
-};
-
-const onClose = (type?) => {
-  type === 'submit' && xgrid.value.getInstance().reloadTreeExpand(row);
-  data.record = {};
-  data.showDrawer = false;
-  data.showAuthority = false;
-};
-</script>
+<template>
+  <div class="page-content">
+    <ut-grid
+      ref="xgrid"
+      :tree-config="{
+        childrenField: 'children',
+        lazy: true,
+        hasChild: 'hasChildren',
+        loadMethod: loadChildrenMethod,
+        iconOpen: 'ri-checkbox-indeterminate-line ri-lg',
+        iconClose: 'ri-add-box-line ri-lg'
+      }"
+      :columns="columns"
+      :url="url"
+      :stripe="false"
+      mode="form"
+      @toolbarButtonClick="handleToolClick"
+    />
+    <MenuInfo
+      :show="data.showDrawer"
+      :record="data.record"
+      :data-status="data.dataStatus"
+      @close="onClose"
+    />
+    <AuthorityPanel :show="data.showAuthority" :record="data.record" @close="onClose" />
+  </div>
+</template>
+
+<script lang="tsx">
+export default { name: 'SystemMenu' };
+</script>
+<script setup lang="tsx">
+import { useI18n } from 'vue-i18n';
+import { ref, reactive } from 'vue';
+import MenuInfo from './menuInfo.vue';
+import AuthorityPanel from './AuthorityPanel.vue';
+import { clone } from 'xe-utils';
+import to from 'await-to-js';
+import { VxeUI } from 'vxe-pc-ui';
+import { useRender } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+const data = reactive<IRecord>({
+  record: {},
+  dataList: [],
+  submitLoading: false,
+  showDrawer: false,
+  dataStatus: '',
+  total: 0,
+  listQuery: {
+    pageSize: 10,
+    pageNum: 1
+  }
+});
+
+const { t } = useI18n();
+
+const renderHook = useRender();
+
+const serviceApi = getServiceApi();
+
+const xgrid = ref(null);
+
+const url = '/uums/menu';
+
+let row;
+
+// const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
+
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'menuName', width: 180, treeNode: true },
+  { field: 'menuNameEn', width: 140 },
+  { field: 'sort', width: 70 },
+  { field: 'menuCode', width: 140 },
+  { field: 'permissionCode', minWidth: 180 },
+  {
+    field: 'menuCategory',
+    title: 'message.menuType',
+    formatter: ['formatDict', 'SU.MENU.TYPE'],
+    width: 100
+  },
+  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleUpdate) },
+  {
+    field: 'operate',
+    width: 140,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        const type = row.menuType;
+        const addCmp = (
+          <ut-button status="u-cyan" icon="ri-add-fill" content="add" onTap={() => handleAdd(row)} />
+        );
+        const authCmp = (
+          <ut-button icon="ri-lock-fill" content="auth" onTap={() => handleAuthorityPanel(row)} />
+        );
+        return [
+          <>
+            {!type ? (
+              <>
+                <ut-button
+                  status="success"
+                  icon="ri-edit-box-line"
+                  content="edit"
+                  onTap={() => handleEdit(row)}
+                />
+                {['0', '5'].includes(row.menuCategory) ? addCmp : authCmp}
+              </>
+            ) : null}
+          </>
+        ];
+      }
+    }
+  }
+];
+
+// const resetListQuery = () => {
+//   data.listQuery.pageSize = 99;
+//   data.listQuery.pageNum = 1;
+//   getDataList();
+// };
+
+// const getDataList = async () => {
+//   const res = (await serviceApi('sys/listMenus', data.listQuery)) as IResponseData;
+//   data.dataList = res.list;
+//   data.total = res.total;
+// };
+
+const handleToolClick = ({ code }) => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+
+// 异步加载子节点
+const loadChildrenMethod = async ({ row }: any) => {
+  const data = (await serviceApi.get(url, { parentId: row.id })) as IResponseData;
+  return new Promise(resolve => {
+    resolve(data.list);
+  });
+};
+
+// 新增子类型
+// menuType:保持原有不懂， 0:菜单 1，数据权限
+// 新增menuCategory: 0、根目录 1、菜单 2、内部链接3、外部链接
+const handleAdd = (record?: IRecord) => {
+  data.showDrawer = true;
+  data.dataStatus = 'add';
+  data.record.dispalyCode = record?.permissionCode; // 前缀
+  data.record.permissionCode = record?.permissionCode;
+  // data.record.menuType = !record || !record.parentId ? '0' : '1';
+  data.record.menuType = '0';
+  data.record.menuCategory = !record ? '0' : '';
+  data.record.parentId = record?.id;
+  data.record.hasChildren = record?.hasChildren;
+  data.record.children = data.record.children || [];
+  console.log(data.record);
+  row = record;
+};
+
+// 编辑
+const handleEdit = (record: IRecord) => {
+  data.showDrawer = true;
+  data.dataStatus = 'update';
+  data.record = clone(record, true);
+  data.record.menuType = data.record.menuType.toString();
+  data.record.dispalyCode = record.permissionCode;
+};
+
+// 启用/禁用
+async function handleUpdate({ row }) {
+  await serviceApi.put(url, [row]);
+  xgrid.value.refreshData();
+}
+// 删除
+const handleDel = async () => {
+  const type = await VxeUI.modal.confirm(t('message.delRecord'));
+  const records = xgrid.value.getInstance().getCheckboxRecords();
+  if (type === 'confirm') {
+    const [err] = await to(serviceApi.delete(url, records));
+  }
+};
+
+const handleAuthorityPanel = record => {
+  data.showAuthority = true;
+  data.dataStatus = 'update';
+  data.record = clone(record, true);
+  data.record.menuType = data.record.menuType.toString();
+  data.record.dispalyCode = record.permissionCode;
+};
+
+const onClose = (type?, record?) => {
+  type === 'submit' && row && xgrid.value.getInstance().reloadTreeExpand(row || record);
+  data.record = {};
+  data.showDrawer = false;
+  data.showAuthority = false;
+};
+</script>

package/src/views/system/menu/menuInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:44:08
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-16 16:45:56
+ * @LastEditTime: 2025-07-17 18:47:22
  * @Description: file content
 -->
 
@@ -242,7 +242,7 @@ const authority = ref(['fetch']);
 const url = '/uums/menu';
 
 const emit = defineEmits<{
-  (e: 'close', type): void;
+  (e: 'close', type, data?): void;
 }>();
 
 const getPrefixCode = () => {
@@ -261,6 +261,7 @@ const onSubmit = () => {
   xForm.value.validate(async valid => {
     if (!valid) {
       loading.value = true;
+      let resData;
       const { record, dataStatus } = props;
       if (dataStatus === 'add') {
         record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
@@ -276,17 +277,18 @@ const onSubmit = () => {
               sort: (idx + 1) * 10
             };
           });
-          await to(serviceApi.post(url, dataList));
-          // if (!err && record.children?.length) {
-          //   // props.record.children.push(...res);
-          // }
+          const [err, res] = await to(serviceApi.post(url, dataList));
+          if (!err) {
+            // props.record.children.push(...res);
+            resData = res[0];
+          }
         }
         loading.value = false;
       } else {
         await to(serviceApi.put(url, [record]));
         loading.value = false;
       }
-      handleClose('submit');
+      handleClose('submit', resData);
     }
   });
 };
@@ -307,8 +309,8 @@ const getLovList = code => {
   });
 };
 // 抽屉关闭
-function handleClose(type) {
-  emit('close', type);
+function handleClose(type, data) {
+  emit('close', type, data);
 }
 </script>