Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev_xx

apps/web-antd/src/router/routes/modules/bpm.ts

@@ -74,6 +74,42 @@ const routes: RouteRecordRaw[] = [
           keepAlive: true,
         },
       },
+      {
+        path: 'manager/model/:type/:id',
+        component: () => import('#/views/bpm/model/form/index.vue'),
+        name: 'BpmModelUpdate',
+        meta: {
+          title: '修改流程',
+          activePath: '/bpm/manager/model',
+          icon: 'carbon:flow-connection',
+          hideInMenu: true,
+          keepAlive: true,
+        },
+      },
+      {
+        path: 'manager/definition',
+        component: () => import('#/views/bpm/model/definition/index.vue'),
+        name: 'BpmProcessDefinition',
+        meta: {
+          title: '流程定义',
+          activePath: '/bpm/manager/model',
+          icon: 'carbon:flow-modeler',
+          hideInMenu: true,
+          keepAlive: true,
+        },
+      },
+      {
+        path: 'process-instance/report',
+        component: () => import('#/views/bpm/processInstance/report/index.vue'),
+        name: 'BpmProcessInstanceReport',
+        meta: {
+          title: '数据报表',
+          activeMenu: '/bpm/manager/model',
+          icon: 'carbon:data-2',
+          hideInMenu: true,
+          keepAlive: true,
+        },
+      },
     ],
   },
 ];

apps/web-antd/src/router/routes/modules/mall.ts

@@ -0,0 +1,76 @@
+// import type { RouteRecordRaw } from 'vue-router';
+
+// const routes: RouteRecordRaw[] = [
+//   {
+//     path: '/mall/product',
+//     name: 'ProductCenter',
+//     meta: {
+//       title: '商品中心',
+//       icon: 'lucide:shopping-bag',
+//       keepAlive: true,
+//       hideInMenu: true,
+//     },
+//     children: [
+//       {
+//         path: 'spu/add',
+//         name: 'ProductSpuAdd',
+//         meta: {
+//           title: '商品添加',
+//           activeMenu: '/mall/product/spu',
+//         },
+//         component: () => import('#/views/mall/product/spu/form/index.vue'),
+//       },
+//       {
+//         path: String.raw`spu/edit/:id(\d+)`,
+//         name: 'ProductSpuEdit',
+//         meta: {
+//           title: '商品编辑',
+//           activeMenu: '/mall/product/spu',
+//         },
+//         component: () => import('#/views/mall/product/spu/form/index.vue'),
+//       },
+//       {
+//         path: String.raw`spu/detail/:id(\d+)`,
+//         name: 'ProductSpuDetail',
+//         meta: {
+//           title: '商品详情',
+//           activeMenu: '/crm/business',
+//         },
+//         component: () => import('#/views/mall/product/spu/form/index.vue'),
+//       },
+//     ],
+//   },
+//   {
+//     path: '/mall/trade',
+//     name: 'TradeCenter',
+//     meta: {
+//       title: '交易中心',
+//       icon: 'lucide:shopping-cart',
+//       keepAlive: true,
+//       hideInMenu: true,
+//     },
+//     children: [
+//       {
+//         path: String.raw`order/detail/:id(\d+)`,
+//         name: 'TradeOrderDetail',
+//         meta: {
+//           title: '订单详情',
+//           activeMenu: '/mall/trade/order',
+//         },
+//         component: () => import('#/views/mall/trade/order/detail/index.vue'),
+//       },
+//       {
+//         path: String.raw`after-sale/detail/:id(\d+)`,
+//         name: 'TradeAfterSaleDetail',
+//         meta: {
+//           title: '退款详情',
+//           activeMenu: '/mall/trade/after-sale',
+//         },
+//         component: () =>
+//           import('#/views/mall/trade/afterSale/detail/index.vue'),
+//       },
+//     ],
+//   },
+// ];
+
+// export default routes;