Merge branch 'liuqiang' into v3

src/layout/indexCommon.vue

@@ -119,7 +119,7 @@
                     :data-path="item.path"
                     :to="{
                       path: item.path,
-                      query: item.row,
+                      query: item.clickRowId,
                     }"
                     @click="paneClick(item)"
                     class="tags-view-item"
@@ -455,7 +455,7 @@ const addFolderAdd = (data) => {
     editableTabs.value.push({
       label: data.name,
       path: data.path,
-      row: JSON.stringify(data.row),
+      clickRowId: data.row,
     });
     //需要jSON去转 否则页面无变化 离谱得很
     editableTabs.value = JSON.parse(JSON.stringify(editableTabs.value));

src/views/myfile/MyFile.vue

@@ -917,9 +917,9 @@ export default {
                      loadingPreview.value = false
                     addTab(clickRow.value);
                     //    const addData = {
-                    //     path:route.path,
-                    //     name:clickRow.fileName,
-                    //     row:toRaw(clickRow)
+                    //     path:"/fileEdit" + clickRow.value.docId,
+                    //     name:clickRow.value.fileName,
+                    //     row:clickRow.value.docId
                     // }
                     // addFolderAdd(addData)
                     onlyView.value = true

vite.config.js

@@ -0,0 +1,75 @@
+import {
+	defineConfig,
+	loadEnv
+} from 'vite'
+import path from 'path'
+import createVitePlugins from './vite/plugins'
+
+// https://vitejs.dev/config/
+export default defineConfig(({
+								 mode,
+								 command
+							 }) => {
+	const env = loadEnv(mode, process.cwd())
+	const {
+		VITE_APP_ENV
+	} = env
+	return {
+		// 部署生产环境和开发环境下的URL。
+		// 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+		// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+		base: VITE_APP_ENV === 'production' ? '/' : '/',
+		plugins: createVitePlugins(env, command === 'build'),
+		resolve: {
+			// https://cn.vitejs.dev/config/#resolve-alias
+			alias: {
+				// 设置路径
+				'~': path.resolve(__dirname, './'),
+				// 设置别名
+				'@': path.resolve(__dirname, './src')
+			},
+			// https://cn.vitejs.dev/config/#resolve-extensions
+			extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
+		},
+		// vite 相关配置
+		server: {
+			port: 80,
+			host: true,
+			open: true,
+			proxy: {
+				// https://cn.vitejs.dev/config/#server-proxy
+				'/dev-api': {
+					target: 'http://192.168.1.28:8080/',
+					// target: 'http://localhost:8080/',
+					// target:'http://192.168.1.28:8080/',
+					// target:'http://8.142.173.95:19527',
+					changeOrigin: true,
+					rewrite: (p) => p.replace(/^\/dev-api/, '')
+				},
+				//websocket代理
+				'/websocket': {
+					// target:'ws://localhost:8080/websocket',
+					target:'ws://192.168.1.28:8080/websocket',
+					// target:'ws://192.168.1.11:8080/websocket',
+					changeOrigin: true,
+					rewrite: (p) => p.replace(/^\/websocket/, '')
+				}
+			}
+		},
+		//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+		css: {
+			postcss: {
+				plugins: [{
+					postcssPlugin: 'internal:charset-removal',
+					AtRule: {
+						charset: (atRule) => {
+							if (atRule.name === 'charset') {
+								atRule.remove();
+							}
+						}
+					}
+				}]
+			}
+		}
+	}
+})