ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
guwd 2020-11-23 10:03:40 +08:00
parent bb41e14084 23e7468444
commit 3582314e47
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/5.2-patch.sql
View File

@ -74,7 +74,6 @@ DROP COLUMN `app_login_page`;
ALTER TABLE `role` ALTER TABLE `role`
CHANGE COLUMN `role_managerid` `manager_id` int(11) NULL DEFAULT 0 COMMENT '角色管理员编号' AFTER `role_name`; CHANGE COLUMN `role_managerid` `manager_id` int(11) NULL DEFAULT 0 COMMENT '角色管理员编号' AFTER `role_name`;
ALTER TABLE `role` ALTER TABLE `role`
CHANGE COLUMN `role_managerid` `manager_id` int(11) NULL DEFAULT 0 COMMENT '角色管理员编号' AFTER `role_name`,
DROP INDEX `role_managerid`, DROP INDEX `role_managerid`,
ADD INDEX `inx_role_manage_id`(`manager_id`) USING BTREE; ADD INDEX `inx_role_manage_id`(`manager_id`) USING BTREE;

25
src/main/webapp/WEB-INF/manager/cms/content/index.ftl
View File

@ -11,7 +11,21 @@
<el-container class="index-menu"> <el-container class="index-menu">
<div class="left-tree" style="position:relative;"> <div class="left-tree" style="position:relative;">
<el-scrollbar style="height: 100%;"> <el-scrollbar style="height: 100%;">
<el-tree :indent="5" v-loading="loading" highlight-current :expand-on-click-node="false" default-expand-all :empty-text="emptyText" :data="treeData" :props="defaultProps" @node-click="handleNodeClick" style="padding: 10px;height: 100%;"></el-tree> <el-tree
:indent="5"
v-loading="loading"
highlight-current
:expand-on-click-node="false"
default-expand-all
:empty-text="emptyText"
:data="treeData"
:props="defaultProps"
@node-click="handleNodeClick"
style="padding: 10px;height: 100%;">
<span class="custom-tree-node" slot-scope="{ node, data }" >
<span :style="data.categoryType == '3' ? 'color: #dcdfe6' : ''" :title="data.categoryTitle">{{ data.categoryTitle }}</span>
</span>
</el-tree>
</el-scrollbar> </el-scrollbar>
</div> </div>
<iframe :src="action" class="ms-iframe-style"> <iframe :src="action" class="ms-iframe-style">
@ -39,8 +53,9 @@
if (data.categoryType == '1') { if (data.categoryType == '1') {
this.action = ms.manager + "/cms/content/main.do?categoryId=" + data.id; this.action = ms.manager + "/cms/content/main.do?categoryId=" + data.id;
} else if (data.categoryType == '2') { } else if (data.categoryType == '2') {
this.action = ms.manager + "/cms/content/form.do?categoryId=" + data.id + "&type=2"; this.action = ms.manager + "/cms/content/form.do?categoryId=" + data.id + "& type=2";
} else { //id=0时为最顶级节点全部节点
} else if (data.id == 0){
this.action = ms.manager + "/cms/content/main.do"; this.action = ms.manager + "/cms/content/main.do";
} }
}, },
@ -63,9 +78,7 @@
} else { } else {
that.emptyText = ''; that.emptyText = '';
// 过滤掉栏目类型为链接属性 // 过滤掉栏目类型为链接属性
that.treeData = res.data.rows.filter(function (item) { that.treeData = res.data.rows;
return item.categoryType =='2' || item.categoryType =='1'
})
that.treeData = ms.util.treeData(that.treeData, 'id', 'categoryId', 'children'); that.treeData = ms.util.treeData(that.treeData, 'id', 'categoryId', 'children');
that.treeData = [{ that.treeData = [{
id: 0, id: 0,