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

# Conflicts:
#	web/src/views/system/login/index.vue

web/package.json

@@ -8,7 +8,8 @@
 		"build:dev": "vite build --mode development",
 		"build": "vite build",
 		"build:local": "vite build --mode local_prod",
-		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
+		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/",
+		"build:flowH5": "vite build --config flowH5.config.ts"
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
@@ -18,6 +19,7 @@
 		"@fast-crud/ui-interface": "^1.21.2",
 		"@great-dream/dvadmin3-celery-web": "^3.1.3",
 		"@iconify/vue": "^4.1.2",
+		"@meetjs/vant4-kit": "^1.0.1",
 		"@types/lodash": "^4.17.7",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
 		"@wangeditor/editor": "^5.1.23",
@@ -48,6 +50,8 @@
 		"print-js": "^1.6.0",
 		"qrcodejs2-fixes": "^0.0.2",
 		"qs": "^6.11.0",
+		"rollup-plugin-postcss": "^4.0.2",
+		"rollup-plugin-terser": "^7.0.2",
 		"screenfull": "^6.0.2",
 		"sortablejs": "^1.15.0",
 		"splitpanes": "^3.1.5",
@@ -62,6 +66,7 @@
 		"vue-draggable-plus": "^0.6.0",
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.14.0",
+		"vue-qr": "^4.0.9",
 		"vue-router": "^4.4.3",
 		"vxe-table": "^4.6.18",
 		"xe-utils": "^3.5.30"

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

@@ -77,7 +77,7 @@ export const createCrudOptions = function ({crudExpose, context}: CreateCrudOpti
             actionbar: {
                 buttons: {
                     add: {
-                        show: auth('btn:Create')
+                        show: auth('menu:CreateButton')
                     },
                     batchAdd: {
 						show: true,
@@ -108,10 +108,10 @@ export const createCrudOptions = function ({crudExpose, context}: CreateCrudOpti
                     edit: {
                         icon: '',
                         type: 'primary',
-                        show: auth('btn:Update')
+                        show: auth('menu:UpdateButton')
                     },
                     remove: {
-                        show: auth('btn:Delete')
+                        show: auth('menu:DeleteButton')
                     },
                 },
             },

web/src/views/system/role/components/searchUsers/crud.tsx

@@ -75,7 +75,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
       actionbar: {
         buttons: {
           add: {
-            show: auth('role:AuthorizedAdd'),
+            show: auth('role:SetMenu'),
             click: (ctx: any) => {
               context!.subUserRef.value.dialog = true;
 							nextTick(() => {
@@ -91,7 +91,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
         //固定右侧
         fixed: 'left',
         width: 120,
-        show: auth('role:AuthorizedDel'),
+        show: auth('role:SetMenu'),
         buttons: {
           view: {
             show: false,
@@ -115,7 +115,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					title: "选择",
 					form: { show: false},
 					column: {
-						show: auth('role:AuthorizedDel'),
+						show: auth('role:SetMenu'),
 						type: "selection",
 						align: "center",
 						width: "55px",

web/src/views/system/role/components/searchUsers/index.vue

@@ -25,7 +25,7 @@
 			</template>
 		<template #pagination-left>
 			<el-tooltip content="批量删除所选择的用户权限">
-				<el-button v-show="selectedRowsCount > 0 && auth('role:AuthorizedDel')" type="danger"  @click="multipleDel" :icon="Delete">批量删除</el-button>
+				<el-button v-show="selectedRowsCount > 0 && auth('role:SetMenu')" type="danger"  @click="multipleDel" :icon="Delete">批量删除</el-button>
 			</el-tooltip>
 		</template>
 	 </fs-crud>

web/src/views/system/user/crud.tsx

@@ -19,7 +19,7 @@ import { computed } from "vue";
 import { Md5 } from 'ts-md5';
 import { commonCrudConfig } from "/@/utils/commonCrud";
 import { ElMessageBox } from 'element-plus';
-import {exportData} from "./api";
+import { exportData } from "./api";
 export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
     const pageRequest = async (query: UserPageQuery) => {
         return await api.GetList(query);
@@ -106,19 +106,15 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
                         type: 'text',
                         show: auth('user:Delete'),
                     },
-                    custom: {
-                        text: '重设密码',
+                    resetDefaultPwd: {
+                        text: '重置密码',
                         type: 'text',
-                        show: auth('user:ResetPassword'),
-                        tooltip: {
-                            placement: 'top',
-                            content: '重设密码',
-                        },
-                        //@ts-ignore
-                        click: (ctx: any) => {
-                            const { row } = ctx;
-                            resetToDefaultPasswordRequest(row)
-                        },
+                        iconRight: 'Setting',
+                        show: auth('user:ResetDefaultPassword'),
+                        click: (ctx: any) => ElMessageBox.confirm(
+                            '确定重置为系统默认密码吗？', '提示',
+                            { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
+                        ).then(() => resetToDefaultPasswordRequest(ctx.row))
                     },
                 },
             },