!262 发布 v5.6.0-v2.6.0 版本 新年第一版

Merge pull request !262 from 疯狂的狮子Li/dev

README.md

@@ -1,7 +1,7 @@
 ## 平台简介
 
 - 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [TS](https://www.typescriptlang.org/) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。
-- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5)
+- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://github.com/imdap/ruoyi-plus-vben5)
 - 成员项目: 基于soybean 的前端项目 [ruoyi-plus-soybean](https://gitee.com/xlsea/ruoyi-plus-soybean)
 
 ## 配套后端代码仓库地址

package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "ruoyi-vue-plus",
-  "version": "5.5.3-2.5.3",
+  "version": "5.6.0-2.6.0",
   "description": "RuoYi-Vue-Plus多租户管理系统",
   "author": "LionLi",
   "license": "MIT",
@@ -74,7 +74,6 @@
     "unplugin-vue-components": "31.0.0",
     "unplugin-vue-setup-extend-plus": "1.0.1",
     "vite": "7.3.1",
-    "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons-ng": "^1.5.2",
     "vite-plugin-vue-devtools": "8.0.7",
     "vitest": "4.0.18",

src/views/index.vue

@@ -33,7 +33,7 @@
           * 部署方式 Docker 容器编排 一键部署业务集群<br />
           * 国际化 SpringMessage Spring标准国际化方案<br />
         </p>
-        <p><b>当前版本:</b> <span>v5.5.3</span></p>
+        <p><b>当前版本:</b> <span>v5.6.0</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>
@@ -77,7 +77,7 @@
           * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
           * 其余与 Vue 版本一致<br />
         </p>
-        <p><b>当前版本:</b> <span>v2.5.3</span></p>
+        <p><b>当前版本:</b> <span>v2.6.0</span></p>
         <p>
           <el-tag type="danger">&yen;免费开源</el-tag>
         </p>

src/views/workflow/processDefinition/index.vue

@@ -42,19 +42,19 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button type="primary" icon="Plus" @click="handleAdd()">添加</el-button>
+                <el-button v-hasPermi="['workflow:definition:add']" type="primary" icon="Plus" @click="handleAdd()">添加</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="success" icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
+                <el-button v-hasPermi="['workflow:definition:edit']" type="success" icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
+                <el-button v-hasPermi="['workflow:definition:remove']" type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
+                <el-button v-hasPermi="['workflow:definition:import']" type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="warning" icon="Download" :disabled="single" @click="handleExportDef">导出</el-button>
+                <el-button v-hasPermi="['workflow:definition:export']" type="warning" icon="Download" :disabled="single" @click="handleExportDef">导出</el-button>
               </el-col>
               <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
             </el-row>
@@ -74,6 +74,7 @@
               <el-table-column align="center" prop="activityStatus" label="激活状态" width="130">
                 <template #default="scope">
                   <el-switch
+                    v-hasPermi="['workflow:definition:active']"
                     v-model="scope.row.activityStatus"
                     :active-value="1"
                     :inactive-value="0"
@@ -92,21 +93,21 @@
                 <template #default="scope">
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                      <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除流程</el-button>
+                      <el-button v-hasPermi="['workflow:definition:remove']" link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除流程</el-button>
                     </el-col>
                     <el-col :span="1.5">
-                      <el-button link type="primary" size="small" icon="CopyDocument" @click="handleCopyDef(scope.row)">复制流程</el-button>
+                      <el-button v-hasPermi="['workflow:definition:copy']" link type="primary" size="small" icon="CopyDocument" @click="handleCopyDef(scope.row)">复制流程</el-button>
                     </el-col>
                   </el-row>
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                      <el-button link type="primary" v-if="scope.row.isPublish === 0" icon="Pointer" size="small" @click="design(scope.row)"
+                      <el-button v-hasPermi="['workflow:definition:query']" link type="primary" v-if="scope.row.isPublish === 0" icon="Pointer" size="small" @click="design(scope.row)"
                         >流程设计</el-button
                       >
-                      <el-button link type="primary" v-else icon="View" size="small" @click="designView(scope.row)">查看流程</el-button>
+                      <el-button v-hasPermi="['workflow:definition:query']" link type="primary" v-else icon="View" size="small" @click="designView(scope.row)">查看流程</el-button>
                     </el-col>
                     <el-col v-if="scope.row.isPublish !== 1" :span="1.5">
-                      <el-button link type="primary" size="small" icon="CircleCheck" @click="handlePublish(scope.row)">发布流程</el-button>
+                      <el-button v-hasPermi="['workflow:definition:publish']" link type="primary" size="small" icon="CircleCheck" @click="handlePublish(scope.row)">发布流程</el-button>
                     </el-col>
                   </el-row>
                 </template>

src/views/workflow/processInstance/index.vue

@@ -50,7 +50,7 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+                <el-button v-hasPermi="['workflow:instance:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
               </el-col>
               <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
             </el-row>
@@ -75,7 +75,7 @@
               <el-table-column align="center" prop="version" label="版本号" width="90">
                 <template #default="scope"> v{{ scope.row.version }}.0</template>
               </el-table-column>
-              <el-table-column v-if="tab === 'running'" align="center" prop="isSuspended" label="状态" min-width="70">
+              <el-table-column v-if="tab === 'running'" v-hasPermi="['workflow:instance:active']" align="center" prop="isSuspended" label="状态" min-width="70">
                 <template #default="scope">
                   <el-tag v-if="!scope.row.isSuspended" type="success">激活</el-tag>
                   <el-tag v-else type="danger">挂起</el-tag>
@@ -104,15 +104,15 @@
                       </el-popover>
                     </el-col>
                     <el-col :span="1.5">
-                      <el-button type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
+                      <el-button v-hasPermi="['workflow:instance:remove']" type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
                     </el-col>
                   </el-row>
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                      <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+                      <el-button v-hasPermi="['workflow:instance:query']" type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
                     </el-col>
                     <el-col :span="1.5">
-                      <el-button type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
+                      <el-button v-hasPermi="['workflow:instance:variableQuery']" type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
                     </el-col>
                   </el-row>
                 </template>
@@ -138,7 +138,7 @@
         <el-table-column align="center" prop="version" label="版本号" width="90">
           <template #default="scope"> v{{ scope.row.version }}.0</template>
         </el-table-column>
-        <el-table-column align="center" prop="suspensionState" label="状态" min-width="70">
+        <el-table-column v-hasPermi="['workflow:instance:active']" align="center" prop="suspensionState" label="状态" min-width="70">
           <template #default="scope">
             <el-tag v-if="scope.row.suspensionState == 1" type="success">激活</el-tag>
             <el-tag v-else type="danger">挂起</el-tag>
@@ -170,7 +170,7 @@
             <el-input v-model="form.value" placeholder="请输入变量值" />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
+            <el-button v-hasPermi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
           </el-form-item>
         </el-form>
       </el-card>

vite/plugins/compression.ts

@@ -1,28 +1,110 @@
-import compression from 'vite-plugin-compression';
+import { promises as fs } from 'fs';
+import path from 'path';
+import zlib from 'zlib';
+import { promisify } from 'util';
+import type { Plugin, ResolvedConfig } from 'vite';
 
-export default (env: any) => {
-  const { VITE_BUILD_COMPRESS } = env;
-  const plugin: any[] = [];
-  if (VITE_BUILD_COMPRESS) {
-    const compressList = VITE_BUILD_COMPRESS.split(',');
-    if (compressList.includes('gzip')) {
-      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
-      plugin.push(
-        compression({
-          ext: '.gz',
-          deleteOriginFile: false
-        })
-      );
-    }
-    if (compressList.includes('brotli')) {
-      plugin.push(
-        compression({
-          ext: '.br',
-          algorithm: 'brotliCompress',
-          deleteOriginFile: false
-        })
-      );
-    }
+const gzip = promisify(zlib.gzip);
+const brotliCompress = promisify(zlib.brotliCompress);
+const compressibleFileRE = /\.(js|mjs|json|css|html)$/i;
+const defaultThreshold = 1025;
+
+type CompressionKind = 'gzip' | 'brotli';
+
+const compressionHandlers: Record<CompressionKind, { ext: string; compress: (content: Buffer) => Promise<Buffer> }> = {
+  gzip: {
+    ext: '.gz',
+    compress: (content) => gzip(content, { level: zlib.constants.Z_BEST_COMPRESSION })
+  },
+  brotli: {
+    ext: '.br',
+    compress: (content) =>
+      brotliCompress(content, {
+        params: {
+          [zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY,
+          [zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT
+        }
+      })
   }
-  return plugin;
+};
+
+async function collectFiles(rootDir: string): Promise<string[]> {
+  const entries = await fs.readdir(rootDir, { withFileTypes: true });
+  const files = await Promise.all(
+    entries.map(async (entry) => {
+      const fullPath = path.join(rootDir, entry.name);
+      if (entry.isDirectory()) {
+        return collectFiles(fullPath);
+      }
+      return compressibleFileRE.test(entry.name) ? [fullPath] : [];
+    })
+  );
+  return files.flat();
+}
+
+function createCompressionPlugin(kind: CompressionKind): Plugin {
+  const handler = compressionHandlers[kind];
+  let config: ResolvedConfig | undefined;
+
+  return {
+    name: `local:compression:${kind}`,
+    apply: 'build',
+    enforce: 'post',
+    configResolved(resolvedConfig) {
+      config = resolvedConfig;
+    },
+    async closeBundle() {
+      const outputDir = path.resolve(process.cwd(), config?.build.outDir ?? 'dist');
+      const files = await collectFiles(outputDir);
+      const compressedEntries: Array<{ file: string; originalKb: string; compressedKb: string }> = [];
+
+      await Promise.all(
+        files.map(async (filePath) => {
+          const stat = await fs.stat(filePath);
+          if (stat.size < defaultThreshold) {
+            return;
+          }
+
+          const content = await fs.readFile(filePath);
+          const compressed = await handler.compress(content);
+          const outputFile = `${filePath}${handler.ext}`;
+
+          await fs.writeFile(outputFile, compressed);
+          compressedEntries.push({
+            file: path.relative(outputDir, outputFile).replaceAll('\\', '/'),
+            originalKb: (stat.size / 1024).toFixed(2),
+            compressedKb: (compressed.byteLength / 1024).toFixed(2)
+          });
+        })
+      );
+
+      if (!compressedEntries.length) {
+        return;
+      }
+
+      compressedEntries.sort((a, b) => a.file.localeCompare(b.file));
+      config?.logger.info(`\n[compression:${kind}] generated ${compressedEntries.length} files`);
+      for (const entry of compressedEntries) {
+        config?.logger.info(`${path.basename(outputDir)}/${entry.file} ${entry.originalKb}kb -> ${entry.compressedKb}kb`);
+      }
+      config?.logger.info('');
+    }
+  };
+}
+
+export default (env: Record<string, string>) => {
+  const { VITE_BUILD_COMPRESS } = env;
+  const plugins: Plugin[] = [];
+  if (!VITE_BUILD_COMPRESS) {
+    return plugins;
+  }
+
+  const compressionList = VITE_BUILD_COMPRESS.split(',').map((item) => item.trim()) as CompressionKind[];
+  if (compressionList.includes('gzip')) {
+    plugins.push(createCompressionPlugin('gzip'));
+  }
+  if (compressionList.includes('brotli')) {
+    plugins.push(createCompressionPlugin('brotli'));
+  }
+  return plugins;
 };