@utogether/udp-core 1.0.1-beta.23 → 1.0.1-beta.25

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@utogether/udp-core",
   "private": false,
-  "version": "1.0.1-beta.23",
+  "version": "1.0.1-beta.25",
   "description": "",
   "type": "module",
   "main1": "index.ts",

package/src/main.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-25 13:38:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-10-19 12:15:08
+ * @LastEditTime: 2025-11-14 10:52:54
  * @FilePath: \udp-front\packages\udp-core\src\main.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -32,23 +32,23 @@ import './style/index.scss';
 
 // import SuTable from './components/SuTable/SuTable.vue';
 
-import {
-  // UtButton,
-  // utLov2,
-  // UGrid,
-  //   UtDivider,
-  // UtModalForm2
-  // FormUpload2,
-  UtForm2,
-  UtGrid2
-  // UtContent2,
-  // UtStampBadge2
-  // UtModalGrid2
-  // UtUpload2
-  //   UtIconSelect,
-  //   UtCalendar
-  // uAttachment
-} from './components/udp';
+// import {
+// UtButton,
+// utLov2,
+// UGrid,
+//   UtDivider,
+// UtModalForm2
+// FormUpload2,
+// UtForm2,
+// UtGrid2
+// UtContent2,
+// UtStampBadge2
+// UtModalGrid2
+// UtUpload2
+//   UtIconSelect,
+//   UtCalendar
+// uAttachment
+// } from './components/udp';
 
 const app = createApp(App);
 
@@ -93,8 +93,8 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
     //   .component('UtDivider', UtDivider)
     // app.component('UtModalForm2', UtModalForm2);
-    app.component('UtGrid2', UtGrid2);
-    app.component('UtForm2', UtForm2);
+    // app.component('UtGrid2', UtGrid2);
+    // app.component('UtForm2', UtForm2);
     // app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)
     // app.component('FormUpload2', FormUpload2);

package/src/plugins/i18n/zh.ts

@@ -109,7 +109,9 @@ export default {
     organizationName: '组织名称',
     organizationCode: '组织编码',
     appupper: '已上架',
-    applower: '已下架'
+    applower: '已下架',
+    isApprovalPage: '审批页面',
+    showLink: '菜单可见'
   },
   btn: {
     passwordReset: '密码重置',

package/src/router/utils.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2024-08-01 21:42:39
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-10 09:22:45
+ * @LastEditTime: 2025-11-13 18:18:46
  * @FilePath: \udp-front\packages\udp-core\src\router\utils.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -298,7 +298,7 @@ const addAsyncRoutes = (arrRoutes: Array<any>) => {
     }
     const { icon, permissionCode, extraIcon, frameSrc } = v;
     // 流程菜单保存
-    v.isFlowMenu && processMenus.push(v);
+    v.isApprovalPage === 'Y' && processMenus.push(v);
 
     v.meta = {
       keepAlive: true,

package/src/style/button.scss

@@ -1,85 +1,85 @@
-.vxe-button.size--mini.type--button {
-  height: 25px;
-}
-
-.vxe-button.size--small.type--button {
-  height: 25px;
-}
-
-.vxe-button.type--button.theme--u-cyan,
-.vxe-button.type--button.theme--u-cyan:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-cyan {
-  background-color: #1cbbb4;
-}
-
-.vxe-button.type--button.theme--u-cyan:active {
-  background-color: #39b54a;
-}
-
-// 禁用状态
-.vxe-button.type--button.theme--u-cyan.is--disabled {
-  background-color: #69e4de;
-  border-color: #69e4de;
-}
-
-.vxe-button.type--button.theme--u-color-shallow,
-.vxe-button.type--button.theme--u-color-shallow:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-color-shallow {
-  background-color: #fbbd08;
-}
-
-.vxe-button.type--button.theme--u-color-shallow:active {
-  background-color: #fff;
-}
-
-.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
-  background-color: #40e0d0;
-  border-color: #40e0d0;
-}
-
-.vxe-button.type--button:not(.is--disabled):hover {
-  color: inherit;
-
-  .vxe-button--icon,
-  .vxe-button--item {
-    color: inherit;
-  }
-}
-
-.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
-  .vxe-button--item {
-    color: var(--udp-theme-vxeColor);
-  }
-}
-
-.u-color-royalBlue {
-  color: #4169e1;
-}
-
-.u-color-turquoise {
-  color: #40e0d0;
-}
-
-.el-dropdown {
-  .el-dropdown__caret-button {
-    margin-left: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  .el-button-group + .el-button {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-
-  .el-button:first-child {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-}
+.vxe-button.size--mini.type--button {
+  height: 25px;
+}
+
+.vxe-button.size--small.type--button {
+  height: 25px;
+}
+
+.vxe-button.type--button.theme--u-cyan,
+.vxe-button.type--button.theme--u-cyan:hover {
+  color: #fff !important;
+}
+
+.vxe-button.type--button.theme--u-cyan {
+  background-color: #1cbbb4;
+}
+
+.vxe-button.type--button.theme--u-cyan:active {
+  background-color: #39b54a;
+}
+
+// 禁用状态
+.vxe-button.type--button.theme--u-cyan.is--disabled {
+  background-color: #69e4de;
+  border-color: #69e4de;
+}
+
+.vxe-button.type--button.theme--u-color-shallow,
+.vxe-button.type--button.theme--u-color-shallow:hover {
+  color: #fff;
+}
+
+.vxe-button.type--button.theme--u-color-shallow {
+  background-color: #fbbd08;
+}
+
+.vxe-button.type--button.theme--u-color-shallow:active {
+  background-color: #fff;
+}
+
+.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
+  background-color: #40e0d0;
+  border-color: #40e0d0;
+}
+
+.vxe-button.type--button:not(.is--disabled):hover {
+  color: inherit;
+
+  .vxe-button--icon,
+  .vxe-button--item {
+    color: inherit;
+  }
+}
+
+.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
+  .vxe-button--item {
+    color: var(--udp-theme-vxeColor);
+  }
+}
+
+.u-color-royalBlue {
+  color: #4169e1;
+}
+
+.u-color-turquoise {
+  color: #40e0d0;
+}
+
+.el-dropdown {
+  .el-dropdown__caret-button {
+    margin-left: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  .el-button-group + .el-button {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+
+  .el-button:first-child {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+}

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

@@ -1,183 +1,185 @@
-<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 || record) && xgrid.value.getInstance().reloadTreeExpand(row || record);
-  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.showLink = 'Y';
+  data.record.isApprovalPage = 'N';
+  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 || record) && xgrid.value.getInstance().reloadTreeExpand(row || record);
+  data.record = {};
+  data.showDrawer = false;
+  data.showAuthority = false;
+};
+</script>