Merge remote-tracking branch 'Soybean/main' into dev

# Conflicts:
#	build/config/proxy.ts
#	package.json
#	pnpm-lock.yaml

build/config/proxy.ts

@@ -1,4 +1,4 @@
-import type { HttpProxy, ProxyOptions } from 'vite';
+import type { ProxyOptions } from 'vite';
 import { bgRed, bgYellow, green, lightBlue } from 'kolorist';
 import { consola } from 'consola';
 import { createServiceConfig } from '../../src/utils/service';
@@ -34,7 +34,7 @@ function createProxyItem(item: App.Service.ServiceConfigItem, enableLog: boolean
     target: item.baseURL,
     changeOrigin: true,
     ws: item.ws,
-    configure: (_proxy: HttpProxy.Server, options: ProxyOptions) => {
+    configure: (_proxy, options) => {
       _proxy.on('proxyReq', (_proxyReq, req, _res) => {
         if (!enableLog) return;
 

package.json

@@ -66,11 +66,11 @@
     "@sa/tinymce": "workspace:*",
     "@sa/utils": "workspace:*",
     "@types/streamsaver": "^2.0.5",
-    "@vueuse/core": "13.5.0",
+    "@vueuse/core": "13.8.0",
     "clipboard": "2.0.11",
-    "dayjs": "1.11.13",
+    "dayjs": "1.11.14",
     "defu": "6.1.4",
-    "echarts": "5.6.0",
+    "echarts": "6.0.0",
     "highlight.js": "^11.11.1",
     "jsencrypt": "^3.3.2",
     "json5": "2.2.3",
@@ -80,46 +80,47 @@
     "pinia": "3.0.3",
     "streamsaver": "^2.0.6",
     "tailwind-merge": "3.3.1",
-    "vue": "3.5.17",
+    "vue": "3.5.20",
     "vue-advanced-cropper": "^2.8.9",
     "vue-draggable-plus": "0.6.0",
-    "vue-i18n": "11.1.9",
-    "vue-router": "4.5.1"
+    "vue-i18n": "11.1.11",
+    "vue-router": "4.5.1",
+    "xlsx": "0.18.5"
   },
   "devDependencies": {
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.357",
+    "@iconify/json": "2.2.378",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config": "1.7.1",
-    "@types/node": "24.0.13",
+    "@types/node": "24.3.0",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "66.3.3",
-    "@unocss/preset-icons": "66.3.3",
-    "@unocss/preset-uno": "66.3.3",
-    "@unocss/transformer-directives": "66.3.3",
-    "@unocss/transformer-variant-group": "66.3.3",
-    "@unocss/vite": "66.3.3",
-    "@vitejs/plugin-vue": "6.0.0",
-    "@vitejs/plugin-vue-jsx": "5.0.1",
+    "@unocss/eslint-config": "66.4.2",
+    "@unocss/preset-icons": "66.4.2",
+    "@unocss/preset-uno": "66.4.2",
+    "@unocss/transformer-directives": "66.4.2",
+    "@unocss/transformer-variant-group": "66.4.2",
+    "@unocss/vite": "66.4.2",
+    "@vitejs/plugin-vue": "6.0.1",
+    "@vitejs/plugin-vue-jsx": "5.1.0",
     "consola": "3.4.2",
-    "eslint": "9.31.0",
-    "eslint-plugin-vue": "10.3.0",
+    "eslint": "9.34.0",
+    "eslint-plugin-vue": "10.4.0",
     "kolorist": "1.8.0",
-    "sass": "1.89.2",
-    "simple-git-hooks": "2.13.0",
-    "tsx": "4.20.3",
-    "typescript": "5.8.3",
-    "unplugin-icons": "22.1.0",
-    "unplugin-vue-components": "28.8.0",
-    "vite": "7.0.4",
+    "sass": "1.91.0",
+    "simple-git-hooks": "2.13.1",
+    "tsx": "4.20.5",
+    "typescript": "5.9.2",
+    "unplugin-icons": "22.2.0",
+    "unplugin-vue-components": "29.0.0",
+    "vite": "7.1.3",
     "vite-plugin-monaco-editor": "^1.1.0",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-static-copy": "^3.1.0",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.7.7",
+    "vite-plugin-vue-devtools": "8.0.1",
     "vue-eslint-parser": "10.2.0",
-    "vue-tsc": "3.0.1"
+    "vue-tsc": "3.0.6"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm sa git-commit-verify",

packages/axios/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@sa/utils": "workspace:*",
-    "axios": "1.10.0",
+    "axios": "1.11.0",
     "axios-retry": "4.5.0",
     "qs": "6.14.0"
   },

packages/scripts/package.json

@@ -14,14 +14,14 @@
   },
   "devDependencies": {
     "@soybeanjs/changelog": "0.3.24",
-    "bumpp": "10.2.0",
-    "c12": "3.0.4",
+    "bumpp": "10.2.3",
+    "c12": "3.2.0",
     "cac": "6.7.14",
     "consola": "3.4.2",
     "enquirer": "2.4.1",
     "execa": "9.6.0",
     "kolorist": "1.8.0",
-    "npm-check-updates": "18.0.1",
+    "npm-check-updates": "18.0.3",
     "rimraf": "6.0.1"
   }
 }

src/components/custom/dict-tag.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue';
 import type { TagProps } from 'naive-ui';
+import { jsonClone } from '@sa/utils';
 import { useDict } from '@/hooks/business/dict';
 import { isNotNull } from '@/utils/common';
 import { $t } from '@/locales';
@@ -28,7 +29,7 @@ const { transformDictData } = useDict(props.dictCode, props.immediate);
 
 const dictTagData = computed<Api.System.DictData[]>(() => {
   if (props.dictData) {
-    const dictData = props.dictData;
+    const dictData = jsonClone(props.dictData);
     if (dictData.dictLabel?.startsWith(`dict.${dictData.dictType}.`)) {
       dictData.dictLabel = $t(dictData.dictLabel as App.I18n.I18nKey);
     }

src/hooks/business/download.ts

@@ -113,6 +113,10 @@ export function useDownload() {
 
       const response = await fetch(fullUrl, requestOptions);
 
+      if (response.status !== 200) {
+        throw new Error(errorCodeRecord.default);
+      }
+
       await handleResponse(response);
 
       const rawHeader = response.headers.get('Download-Filename');

src/utils/export.ts

@@ -0,0 +1,71 @@
+import { utils, writeFile } from 'xlsx';
+import { isNotNull } from '@/utils/common';
+import { $t } from '@/locales';
+
+export interface ExportExcelProps<T> {
+  columns: NaiveUI.TableColumn<NaiveUI.TableDataWithIndex<T>>[];
+  data: NaiveUI.TableDataWithIndex<T>[];
+  filename: string;
+  ignoreKeys?: (keyof NaiveUI.TableDataWithIndex<T> | NaiveUI.CustomColumnKey)[];
+  dicts?: Record<keyof NaiveUI.TableDataWithIndex<T>, string>;
+}
+
+export function exportExcel<T>({
+  columns,
+  data,
+  filename,
+  dicts,
+  ignoreKeys = ['index', 'operate']
+}: ExportExcelProps<T>) {
+  const exportColumns = columns.filter(col => isTableColumnHasKey(col) && !ignoreKeys?.includes(col.key));
+
+  const excelList = data.map(item => exportColumns.map(col => getTableValue(col, item, dicts)));
+
+  const titleList = exportColumns.map(col => (isTableColumnHasTitle(col) && col.title) || null);
+
+  excelList.unshift(titleList);
+
+  const workBook = utils.book_new();
+
+  const workSheet = utils.aoa_to_sheet(excelList);
+
+  workSheet['!cols'] = exportColumns.map(item => ({
+    width: Math.round(Number(item.width) / 10 || 20)
+  }));
+
+  utils.book_append_sheet(workBook, workSheet, filename);
+
+  writeFile(workBook, `${filename}.xlsx`);
+}
+
+function getTableValue<T>(
+  col: NaiveUI.TableColumn<NaiveUI.TableDataWithIndex<T>>,
+  item: NaiveUI.TableDataWithIndex<T>,
+  dicts?: Record<keyof NaiveUI.TableDataWithIndex<T>, string>
+) {
+  if (!isTableColumnHasKey(col)) {
+    return null;
+  }
+
+  const { key } = col;
+
+  if (key === 'operate') {
+    return null;
+  }
+
+  if (isNotNull(dicts?.[key]) && isNotNull(item[key])) {
+    return $t(item[key] as App.I18n.I18nKey);
+  }
+
+  return item[key];
+}
+
+function isTableColumnHasKey<T>(column: NaiveUI.TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> {
+  return Boolean((column as NaiveUI.TableColumnWithKey<T>).key);
+}
+
+function isTableColumnHasTitle<T>(column: NaiveUI.TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> & {
+  title: string;
+} {
+  return Boolean((column as NaiveUI.TableColumnWithKey<T>).title);
+}