Merge branch 'example' into feature/gavin/example

* example:
  feat(projects): 添加插件示例：剪贴板
  docs(projects): update CHANGELOG
  chore(projects): release v1.1.0-beta.2
  fix(projects): fix menu data when role is changed. fixed #391
  feat(projects): useTable adds expand to display

# Conflicts:
#	src/locales/langs/en-us.ts
#	src/locales/langs/zh-cn.ts
#	src/router/elegant/imports.ts
#	src/router/elegant/routes.ts
#	src/router/elegant/transform.ts
#	src/typings/elegant-router.d.ts

CHANGELOG.md

@@ -1,6 +1,31 @@
 # Changelog
 
 
+## [v1.1.0-beta.2](https://github.com/honghuangdc/soybean-admin/compare/v1.1.0-beta.1...v1.1.0-beta.2) (2024-05-07)
+
+###    🚀 Features
+
+- **projects**: useTable adds expand to display &nbsp;-&nbsp; by **paynezhuang** [<samp>(0a90d)</samp>](https://github.com/honghuangdc/soybean-admin/commit/0a90dd3)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
+
+- **projects**:
+  - fix manage_menu modal style &nbsp;-&nbsp; by @honghuangdc [<samp>(60f3b)</samp>](https://github.com/honghuangdc/soybean-admin/commit/60f3b14)
+  - fix menu data when role is changed. fixed #391 &nbsp;-&nbsp; by @honghuangdc in https://github.com/honghuangdc/soybean-admin/issues/391 [<samp>(3b47b)</samp>](https://github.com/honghuangdc/soybean-admin/commit/3b47b5a)
+
+### &nbsp;&nbsp;&nbsp;🛠 Optimizations
+
+- **projects**: remove deprecated code &nbsp;-&nbsp; by @honghuangdc [<samp>(72ccb)</samp>](https://github.com/honghuangdc/soybean-admin/commit/72ccb6b)
+
+### &nbsp;&nbsp;&nbsp;📖 Documentation
+
+- **projects**: add CHANGELOG.zh_CN.md &nbsp;-&nbsp; by @honghuangdc [<samp>(18b3f)</samp>](https://github.com/honghuangdc/soybean-admin/commit/18b3f05)
+
+### &nbsp;&nbsp;&nbsp;❤️ Contributors
+
+[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
+[paynezhuang](mailto:paynezhuang@gmail.com)
+
 ## [v1.1.0-beta.1](https://github.com/soybeanjs/soybean-admin/compare/v1.0.9...v1.1.0-beta.1) (2024-05-07)
 
 ### &nbsp;&nbsp;&nbsp;🚀 Features

CHANGELOG.zh_CN.md

@@ -1,5 +1,30 @@
 # 更新日志
 
+## [v1.1.0-beta.2](https://github.com/honghuangdc/soybean-admin/compare/v1.1.0-beta.1...v1.1.0-beta.2) (2024-05-07)
+
+###    🚀 特性
+
+- **项目**: useTable添加展开以显示 &nbsp;-&nbsp; 由 **paynezhuang** [<samp>(0a90d)</samp>](https://github.com/honghuangdc/soybean-admin/commit/0a90dd3) 提供
+
+### &nbsp;&nbsp;&nbsp;🐞 修复的错误
+
+- **项目**:
+  - 修复 manage_menu 模态样式 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(60f3b)</samp>](https://github.com/honghuangdc/soybean-admin/commit/60f3b14) 提供
+  - 当角色改变时修复菜单数据。修复了 #391 &nbsp;-&nbsp; 由 @honghuangdc 在 https://github.com/honghuangdc/soybean-admin/issues/391 [<samp>(3b47b)</samp>](https://github.com/honghuangdc/soybean-admin/commit/3b47b5a) 提供
+
+### &nbsp;&nbsp;&nbsp;🛠 优化
+
+- **项目**: 删除废弃的代码 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(72ccb)</samp>](https://github.com/honghuangdc/soybean-admin/commit/72ccb6b) 提供
+
+### &nbsp;&nbsp;&nbsp;📖 文档
+
+- **项目**: 添加 CHANGELOG.zh_CN.md &nbsp;-&nbsp; 由 @honghuangdc [<samp>(18b3f)</samp>](https://github.com/honghuangdc/soybean-admin/commit/18b3f05) 提供
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献者
+
+[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
+[paynezhuang](mailto:paynezhuang@gmail.com)
+
 
 ## [v1.1.0-beta.1](https://github.com/soybeanjs/soybean-admin/compare/v1.0.9...v1.1.0-beta.1) (2024-05-07)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "exports": {
     ".": "./src/index.ts"
   },

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "exports": {
     ".": "./src/index.ts"
   },

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "exports": {
     ".": "./src/index.ts"
   },

packages/materials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "exports": {
     ".": "./src/index.ts"
   },

packages/ofetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "exports": {
     ".": "./src/index.ts"
   },

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "bin": {
     "sa": "./bin.ts"
   },

packages/uno-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "exports": {
     ".": "./src/index.ts"
   },

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "exports": {
     ".": "./src/index.ts"
   },

src/hooks/common/table.ts

@@ -20,6 +20,8 @@ export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTabl
 
   const SELECTION_KEY = '__selection__';
 
+  const EXPAND_KEY = '__expand__';
+
   const {
     loading,
     empty,
@@ -68,6 +70,12 @@ export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTabl
             title: $t('common.check'),
             checked: true
           });
+        } else if (column.type === 'expand') {
+          checks.push({
+            key: EXPAND_KEY,
+            title: $t('common.expandColumn'),
+            checked: true
+          });
         }
       });
 
@@ -81,6 +89,8 @@ export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTabl
           columnMap.set(column.key as string, column);
         } else if (column.type === 'selection') {
           columnMap.set(SELECTION_KEY, column);
+        } else if (column.type === 'expand') {
+          columnMap.set(EXPAND_KEY, column);
         }
       });
 

src/locales/langs/en-us.ts

@@ -11,6 +11,7 @@ const local: App.I18n.Schema = {
     cancel: 'Cancel',
     close: 'Close',
     check: 'Check',
+    expandColumn: 'Expand Column',
     columnSetting: 'Column Setting',
     config: 'Config',
     confirm: 'Confirm',
@@ -179,7 +180,8 @@ const local: App.I18n.Schema = {
     exception_500: '500',
     'plugins-example': 'Plugin-Example',
     'plugins-example_charts': 'Charts',
-    'plugins-example_charts_echarts': 'ECharts'
+    'plugins-example_charts_echarts': 'ECharts',
+    'plugins-example_copy': 'copy'
   },
   page: {
     login: {

src/locales/langs/zh-cn.ts

@@ -11,6 +11,7 @@ const local: App.I18n.Schema = {
     cancel: '取消',
     close: '关闭',
     check: '勾选',
+    expandColumn: '展开列',
     columnSetting: '列设置',
     config: '配置',
     confirm: '确认',
@@ -179,7 +180,8 @@ const local: App.I18n.Schema = {
     exception_500: '500',
     'plugins-example': '插件示例',
     'plugins-example_charts': '图表',
-    'plugins-example_charts_echarts': 'ECharts'
+    'plugins-example_charts_echarts': 'ECharts',
+    'plugins-example_copy': '剪贴板'
   },
   page: {
     login: {

src/router/elegant/imports.ts

@@ -37,5 +37,6 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   "multi-menu_first_child": () => import("@/views/multi-menu/first_child/index.vue"),
   "multi-menu_second_child_home": () => import("@/views/multi-menu/second_child_home/index.vue"),
   "plugins-example_charts_echarts": () => import("@/views/plugins-example/charts_echarts/index.vue"),
+  "plugins-example_copy": () => import("@/views/plugins-example/copy/index.vue"),
   "user-center": () => import("@/views/user-center/index.vue"),
 };

src/router/elegant/routes.ts

@@ -362,6 +362,15 @@ export const generatedRoutes: GeneratedRoute[] = [
             }
           }
         ]
+      },
+      {
+        name: 'plugins-example_copy',
+        path: '/plugins-example/copy',
+        component: 'view.plugins-example_copy',
+        meta: {
+          title: 'plugins-example_copy',
+          i18nKey: 'route.plugins-example_copy'
+        }
       }
     ]
   },

src/router/elegant/transform.ts

@@ -186,6 +186,7 @@ const routeMap: RouteMap = {
   "plugins-example": "/plugins-example",
   "plugins-example_charts": "/plugins-example/charts",
   "plugins-example_charts_echarts": "/plugins-example/charts/echarts",
+  "plugins-example_copy": "/plugins-example/copy",
   "user-center": "/user-center"
 };
 

src/store/modules/route/index.ts

@@ -56,7 +56,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
   const constantRoutes = shallowRef<ElegantConstRoute[]>([]);
 
   function addConstantRoutes(routes: ElegantConstRoute[]) {
-    const constantRoutesMap = new Map(constantRoutes.value.map(route => [route.name, route]));
+    const constantRoutesMap = new Map<string, ElegantConstRoute>([]);
 
     routes.forEach(route => {
       constantRoutesMap.set(route.name, route);
@@ -69,7 +69,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
   const authRoutes = shallowRef<ElegantConstRoute[]>([]);
 
   function addAuthRoutes(routes: ElegantConstRoute[]) {
-    const authRoutesMap = new Map(authRoutes.value.map(route => [route.name, route]));
+    const authRoutesMap = new Map<string, ElegantConstRoute>([]);
 
     routes.forEach(route => {
       authRoutesMap.set(route.name, route);

src/typings/app.d.ts

@@ -261,6 +261,7 @@ declare namespace App {
         cancel: string;
         close: string;
         check: string;
+        expandColumn: string;
         columnSetting: string;
         config: string;
         confirm: string;

src/typings/elegant-router.d.ts

@@ -60,6 +60,7 @@ declare module "@elegant-router/types" {
     "plugins-example": "/plugins-example";
     "plugins-example_charts": "/plugins-example/charts";
     "plugins-example_charts_echarts": "/plugins-example/charts/echarts";
+    "plugins-example_copy": "/plugins-example/copy";
     "user-center": "/user-center";
   };
 
@@ -156,6 +157,7 @@ declare module "@elegant-router/types" {
     | "multi-menu_first_child"
     | "multi-menu_second_child_home"
     | "plugins-example_charts_echarts"
+    | "plugins-example_copy"
     | "user-center"
   >;
 

src/views/plugins-example/copy/index.vue

@@ -0,0 +1,31 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { useClipboard } from '@vueuse/core';
+
+const source = ref('');
+const { copy, isSupported } = useClipboard();
+
+function handleCopy() {
+  if (!isSupported) {
+    window.$message?.error('您的浏览器不支持Clipboard API');
+    return;
+  }
+  if (!source.value) {
+    window.$message?.error('请输入要复制的内容');
+    return;
+  }
+  copy(source.value);
+  window.$message?.success(`复制成功：${source.value}`);
+}
+</script>
+
+<template>
+  <div class="h-full">
+    <NCard title="文本复制" :bordered="false" class="h-full rounded-8px shadow-sm">
+      <NInputGroup>
+        <NInput v-model:value="source" placeholder="请输入要复制的内容吧" />
+        <NButton type="primary" @click="handleCopy">复制</NButton>
+      </NInputGroup>
+    </NCard>
+  </div>
+</template>