Merge remote-tracking branch 'origin/dev' into dev

web/.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
 node_modules
 /dist
-
+package-lock.json
+yarn.lock
 
 # local env files
 .env.local

web/src/views/system/menu/components/menuButton/crud.tsx

@@ -34,6 +34,16 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 	};
 	return {
 		crudOptions: {
+			search: {
+        container: {
+          action: {
+            //按钮栏配置
+            col: {
+              span: 8
+            }
+          }
+        },
+      },
 			rowHandle: {
 				//固定右侧
 				fixed: 'right',

web/vite.config.ts

@@ -17,7 +17,7 @@ const alias: Record<string, string> = {
 const viteConfig = defineConfig((mode: ConfigEnv) => {
 	const env = loadEnv(mode.mode, process.cwd());
 	return {
-		plugins: [vue(), vueJsx(),vueSetupExtend()],
+		plugins: [vue(), vueJsx(), vueSetupExtend()],
 		root: process.cwd(),
 		resolve: { alias },
 		base: mode.command === 'serve' ? './' : env.VITE_PUBLIC_PATH,
@@ -27,7 +27,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 		server: {
 			host: '0.0.0.0',
 			port: env.VITE_PORT as unknown as number,
-			open: env.VITE_OPEN,
+			open: true,
 			hmr: true,
 			proxy: {
 				'/gitee': {