diff --git a/dist.zip b/dist.zip index cbcbc76..9a29666 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/components/SearchForm/components/SearchFormItem.vue b/src/components/SearchForm/components/SearchFormItem.vue index 0c76374..d57a029 100644 --- a/src/components/SearchForm/components/SearchFormItem.vue +++ b/src/components/SearchForm/components/SearchFormItem.vue @@ -77,7 +77,6 @@ :check-strictly="false" show-checkbox style="width: 224px" - :collapse-tags="true" ref="treeSelectRef" @change="handleTreeSelectChange(item)" @remove-tag="handleRemoveTag(item, $event)" diff --git a/src/layouts/LayoutVertical/index.vue b/src/layouts/LayoutVertical/index.vue index 8a5abd2..41b4da6 100644 --- a/src/layouts/LayoutVertical/index.vue +++ b/src/layouts/LayoutVertical/index.vue @@ -46,7 +46,6 @@ const authStore = useAuthStore(); const globalStore = useGlobalStore(); const isCollapse = computed(() => globalStore.isCollapse); const menuList = computed(() => authStore.showMenuListGet); -console.log(menuList, "=menuList="); const activeMenu = computed(() => (route.meta.activeMenu ? route.meta.activeMenu : route.path) as string); diff --git a/src/layouts/components/Menu/components/lv2.vue b/src/layouts/components/Menu/components/lv2.vue index 7570726..fd0281c 100644 --- a/src/layouts/components/Menu/components/lv2.vue +++ b/src/layouts/components/Menu/components/lv2.vue @@ -40,6 +40,7 @@ watch( ); const handleOpenPage = (item: any) => { + console.log(item, "===========item=========="); $router.push({ path: item.path }); diff --git a/src/views/productManagement/list/components/imgInfo.vue b/src/views/productManagement/list/components/imgInfo.vue index 1d6d55c..91ae6f9 100644 --- a/src/views/productManagement/list/components/imgInfo.vue +++ b/src/views/productManagement/list/components/imgInfo.vue @@ -3,11 +3,23 @@
封面图
- - - + +
+
+ + + +
+ +
@@ -116,7 +128,6 @@ const findAttrById = (id: any) => { // 在 row 的 attrs 数组中查找对应 attrId 的对象 const findAttrObjInRow = (row: any, attrId: any) => { - console.log(row.attrs, "=======row==========="); let obj = row.attrs.find((item: any) => item.attr_id === attrId.toString()); if (!obj) { obj = { attr_id: attrId.toString(), attr_value: "" }; diff --git a/src/views/productManagement/list/constant/search.ts b/src/views/productManagement/list/constant/search.ts index c42eb68..f1bad62 100644 --- a/src/views/productManagement/list/constant/search.ts +++ b/src/views/productManagement/list/constant/search.ts @@ -35,27 +35,10 @@ export const FORM_DATA: FormItem[] = [ prop: "treeIds", prop1: "category_id", placeholder: "请选择", - type: "treeSelect", + type: "treeSelect", //treeSelect isArray: true, label: "产品分类: ", - options: [ - { - value: "1", - label: "Level one 1", - children: [ - { - value: "1-1", - label: "Level two 1-1", - children: [ - { - value: "1-1-1", - label: "Level three 1-1-1" - } - ] - } - ] - } - ] + options: [] }, { prop: "Time", diff --git a/src/views/productManagement/list/utils/edit/initDetailParams.ts b/src/views/productManagement/list/utils/edit/initDetailParams.ts index 43bf1b3..ff876d6 100644 --- a/src/views/productManagement/list/utils/edit/initDetailParams.ts +++ b/src/views/productManagement/list/utils/edit/initDetailParams.ts @@ -76,7 +76,6 @@ export const initDetailParams = (dataStore: any, data: any, editorRef: any) => { editorRef?.value?.clearEditor(); // 调用子组件的清空方法 } else { dataStore.detail = htmlDecode(data.detail); //htmlDecode(data.detail); - console.log(data.detail, "=======detail========"); } //图片 diff --git a/src/views/userManagement/role/index.vue b/src/views/userManagement/role/index.vue index 7fec756..45e2f23 100644 --- a/src/views/userManagement/role/index.vue +++ b/src/views/userManagement/role/index.vue @@ -50,6 +50,7 @@ highlight-current :props="defaultProps" @check-change="handleTreeCheckChange" + :check-strictly="false" /> @@ -77,49 +78,54 @@ import { getRoleListEditUpApi, getRoleListSaveApi } from "@/api/modules/roleList"; -//getMenusListApi +//权限列表接口 import { getRoleMenusListApi } from "@/api/modules/webMenusList"; //深拷贝方法 import { cloneDeep } from "lodash-es"; -//表格和搜索條件 +//表格和搜索条件 import { RULE_FORM, FORM_DATA, COLUMNS, EDIT_FORM_DATA, EDIT_RULE_FORM, RULES } from "./constant/index"; -// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） + +// 组件引用 const proTableRef = ref(null); const formRef: any = ref(null); const treeRef: any = ref(null); const defaultProps = { children: "children", - label: "title" + label: "title", + disabled: (data: any) => data.id === 7 // 首页节点ID为7，禁止选择 }; + // 数据源 const dataStore = reactive({ - treeData: [], //权限 - allCheck: false, + treeData: [], //权限树数据 + allCheck: false, //全选框状态 title: "添加角色", //抽屉标题 columns: COLUMNS, //列表配置项 - rules: cloneDeep(RULES), //抽屉表单验证 - editRuleForm: cloneDeep(EDIT_RULE_FORM), - editFormData: cloneDeep(EDIT_FORM_DATA), //抽屉表单配置项 - initParam: cloneDeep(RULE_FORM), // 初始化搜索条件|重置搜索条件 - ruleForm: cloneDeep(RULE_FORM), // 搜索參數 + rules: cloneDeep(RULES), //表单验证规则 + editRuleForm: cloneDeep(EDIT_RULE_FORM), //编辑表单数据 + editFormData: cloneDeep(EDIT_FORM_DATA), //表单配置项 + initParam: cloneDeep(RULE_FORM), //初始化搜索条件 + ruleForm: cloneDeep(RULE_FORM), //搜索参数 formData: FORM_DATA, //搜索配置项 - selectedMenuIds: [], // 新增属性，用于保存选中的菜单 id - isIndeterminate: false, //全选框样式控制 - visible: false, //抽屉控制 - selectRow: {} //当前选择的row + selectedMenuIds: [], //选中的菜单ID（含全选和半选） + isIndeterminate: false, //全选框半选样式 + visible: false, //抽屉显示状态 + selectRow: {} //当前选中行数据 }); -// 处理全选框状态变化 +// 处理全选框状态变化（排除首页节点） const handleAllCheckChange = (checked: any) => { - const allNodeKeys = getAllNodeKeys(dataStore.treeData); + const allNodeKeys = getAllNodeKeys(dataStore.treeData).filter(id => id !== 7); // 排除首页ID if (checked) { - treeRef.value.setCheckedKeys(allNodeKeys); + // 全选时选中所有节点（包括父节点，但首页已禁用） + treeRef.value.setCheckedKeys([7, ...allNodeKeys]); // 强制包含首页 } else { - treeRef.value.setCheckedKeys([]); + // 取消全选时保留首页选中状态 + treeRef.value.setCheckedKeys([7]); } }; -// 获取所有节点的 key +// 获取所有节点的ID（用于全选计算） const getAllNodeKeys = (data: any[]) => { let keys: number[] = []; data.forEach(item => { @@ -131,139 +137,187 @@ const getAllNodeKeys = (data: any[]) => { return keys; }; -// 处理树节点选中状态变化 +// 处理树节点选中状态变化（确保首页始终选中） const handleTreeCheckChange = () => { - const allNodeKeys = getAllNodeKeys(dataStore.treeData); + // 移除 (data: any) 参数 + // 防止手动取消首页选中（虽然已禁用，但做双重保险） + if (!dataStore.selectedMenuIds.some((item: any) => item.menu_id === 7)) { + dataStore.selectedMenuIds.unshift({ menu_id: 7 }); + } + + const allNodeKeys = getAllNodeKeys(dataStore.treeData).filter(id => id !== 7); // 排除首页 + // 获取全选节点ID（包括父节点全选和叶子节点选中） const checkedKeys = treeRef.value.getCheckedKeys(); - if (checkedKeys.length === allNodeKeys.length) { + // 获取半选节点ID（父节点部分子节点选中） + const halfCheckedKeys = treeRef.value.getHalfCheckedKeys(); + // 合并全选和半选ID并去重，强制包含首页 + const allSelectedKeys = [...new Set([7, ...checkedKeys, ...halfCheckedKeys])]; + + // 更新全选框状态（排除首页计算） + const selectedWithoutHome = allSelectedKeys.filter(id => id !== 7); + if (selectedWithoutHome.length === allNodeKeys.length) { dataStore.allCheck = true; dataStore.isIndeterminate = false; - } else if (checkedKeys.length === 0) { + } else if (selectedWithoutHome.length === 0) { dataStore.allCheck = false; dataStore.isIndeterminate = false; } else { dataStore.allCheck = false; dataStore.isIndeterminate = true; } - // 更新选中的菜单 id - dataStore.selectedMenuIds = checkedKeys.map((id: any) => ({ menu_id: id })); + + // 保存所有选中的菜单ID（强制包含首页） + dataStore.selectedMenuIds = allSelectedKeys.map((id: number) => ({ menu_id: id })); }; -//抽屉确认 +// 抽屉确认按钮 const handleConfirmClick = () => { - if (!formRef.value!.ruleFormRef) return; - formRef!.value!.ruleFormRef!.validate((valid: any) => { + if (!formRef.value?.ruleFormRef) return; + formRef.value.ruleFormRef.validate((valid: boolean) => { if (valid) { - console.log("submit!"); dataStore.title === "添加角色" ? getRoleListSave() : getRoleListEditUp(); } else { - console.log("error submit!"); + console.log("表单验证失败"); return false; } }); }; -//重置验证状态 + +// 重置表单验证状态 const resetFields = () => { - if (!formRef.value!.ruleFormRef) return; - formRef!.value!.ruleFormRef.resetFields(); + if (formRef.value?.ruleFormRef) { + formRef.value.ruleFormRef.resetFields(); + } }; -//抽屉重置 + +// 抽屉重置按钮 const handleResetClick = () => { if (dataStore.title === "添加角色") { resetFields(); + // 重置树选择状态（保留首页选中） + treeRef.value?.setCheckedKeys([7]); + dataStore.selectedMenuIds = [{ menu_id: 7 }]; } else { + // 编辑时重新获取详情数据 getRoleListDetails(dataStore.editRuleForm.id); } }; -//添加 + +// 打开添加抽屉 const handleAdd = () => { dataStore.title = "添加角色"; dataStore.visible = true; + // 重置表单和树状态（默认选中首页） + dataStore.editRuleForm = cloneDeep(EDIT_RULE_FORM); + resetFields(); + nextTick(() => { + treeRef.value?.setCheckedKeys([7]); + }); }; -//抽屉关闭前的钩子 + +// 抽屉关闭前处理 const handleBeforeClone = () => { dataStore.selectedMenuIds = []; - treeRef.value.setCheckedKeys([]); + treeRef.value?.setCheckedKeys([]); dataStore.editRuleForm = cloneDeep(EDIT_RULE_FORM); resetFields(); dataStore.visible = false; }; -//按钮点击事件 -const handleBtnClick = (type: any, row: any) => { + +// 编辑/删除按钮点击 +const handleBtnClick = (type: string, row: any) => { dataStore.selectRow = row; - //编辑 if (type === "编辑") { dataStore.visible = true; dataStore.title = "编辑角色"; getRoleListDetails(row.id); - return; - } - //删除 - if (type === "删除") { + } else if (type === "删除") { getRoleListDel(row.id); } }; -//删除 -const getRoleListDel = (id: any) => { +// 删除角色 +const getRoleListDel = (id: number) => { messageBox("你确定要删除?", async () => { const result = await getRoleListDelApi(id); if (result?.code === 0) { - const { msg } = result; - useMsg("success", msg); - proTableRef?.value?.getTableList(); + useMsg("success", result.msg); + proTableRef.value?.getTableList(); } }); }; -//详情 -const getRoleListDetails = async (id: any) => { + +// 获取角色详情并回显（确保首页始终选中） +const getRoleListDetails = async (id: number) => { const result = await getRoleListDetailsApi(id); if (result?.code === 0) { - dataStore.editRuleForm = result?.data; - const menuIds = dataStore.editRuleForm.authorities.map((item: any) => item.menu_id); - // 设置树组件的默认选中节点 + dataStore.editRuleForm = result.data; + // 提取后台返回的权限ID列表，强制包含首页 + let savedMenuIds = dataStore.editRuleForm.authorities.map((item: any) => item.menu_id); + savedMenuIds = [...new Set([7, ...savedMenuIds])]; // 确保首页ID存在 + nextTick(() => { if (treeRef.value) { - treeRef.value.setCheckedKeys(menuIds); + // 筛选出所有叶子节点ID（用于正确触发父节点半选状态） + const leafIds: number[] = []; + const findLeafNodes = (nodes: any[]) => { + nodes.forEach(node => { + if (!node.children || node.children.length === 0) { + // 叶子节点且在保存的ID中才选中 + if (savedMenuIds.includes(node.id)) { + leafIds.push(node.id); + } + } else { + findLeafNodes(node.children); + } + }); + }; + findLeafNodes(dataStore.treeData); + + // 设置叶子节点选中状态，强制包含首页 + treeRef.value.setCheckedKeys([7, ...leafIds]); + // 触发状态更新 + handleTreeCheckChange(); } }); } }; -//保存 + +// 保存新角色 const getRoleListSave = async () => { const result = await getRoleListSaveApi({ ...dataStore.editRuleForm, menu_permission: JSON.stringify(dataStore.selectedMenuIds) }); if (result?.code === 0) { - const { msg } = result; - useMsg("success", msg); + useMsg("success", result.msg); dataStore.visible = false; - dataStore.editRuleForm = cloneDeep(EDIT_RULE_FORM); - proTableRef?.value?.getTableList(); + proTableRef.value?.getTableList(); } }; -//更新 + +// 更新角色信息 const getRoleListEditUp = async () => { const result = await getRoleListEditUpApi({ ...dataStore.editRuleForm, menu_permission: JSON.stringify(dataStore.selectedMenuIds) }); if (result?.code === 0) { - const { msg } = result; - useMsg("success", msg); + useMsg("success", result.msg); dataStore.visible = false; - dataStore.editRuleForm = cloneDeep(EDIT_RULE_FORM); - proTableRef?.value?.getTableList(); + proTableRef.value?.getTableList(); } }; -//权限管理 + +// 获取权限树数据 const getMenusList = async () => { const result = await getRoleMenusListApi(); if (result?.code === 0) { - dataStore.treeData = result?.data; + dataStore.treeData = result.data; } }; + +// 初始化加载权限树 getMenusList(); diff --git a/src/views/userManagement/role/index1.vue b/src/views/userManagement/role/index1.vue new file mode 100644 index 0000000..4609bd9 --- /dev/null +++ b/src/views/userManagement/role/index1.vue @@ -0,0 +1,316 @@ + + + + +