leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改侧边栏滑动问题

Browse Source
This commit is contained in:
罗松柏 2022-01-19 16:58:28 +08:00
parent 2e7ed71068
commit dd54bc0d76
7 changed files with 218 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/main.html
View File

@ -18,7 +18,7 @@
<script src="./src/eventemitter.js"></script>
<script src="./layui/layui.js"></script>
<script src="./src/selectM.js"></script>
<!-- <script src="./src/aaa.js"></script> -->
<script src="./src/jquery-ui.min.js"></script>
<script src="./src/moment.min.js"></script><!-- 时间选择控件 -->
<script src="./src/daterangepicker.min.js"></script><!-- 时间选择控件 -->
<script src="./src/Tdrag.js"></script> <!-- 看板移动空间 -->

10
web/pages/dashboard.html
View File

@ -367,21 +367,21 @@
<img src="./static/img/renyuan.png" class="nav-space-bar" data-id="{{item._id}}"/>
{{# } }}
</a>
<dl class="layui-nav-child modeify-layui-nav-child" id="sidebar-box{{item._id}}">
<dl class="layui-nav-child modeify-layui-nav-child sidebarslide" id="sidebar-boxhuadong">
{{# layui.each(item.children, function(indexs, items){ }}
{{# if(items.onclick == 1 && index == 0){ }}
<dd class="layui-left-dd layui-this" data-authority="{{item.authority}}" data-id="{{items._id}}">
<dd class="layui-left-dd layui-this" data-authority="{{item.authority}}" data-id="{{items._id}}" data-kjid="{{item._id}}">
<a href="javascript:;" class="fontcolor second category">
<span class="tuodong">{{items.name}}</span>
<span class="tuodong" data-id="{{item._id}}">{{items.name}}</span>
{{# if(item.authority == "rw"){ }}
<img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}">
{{# } }}
</a>
</dd>
{{# } else { }}
<dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}">
<dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}" data-kjid="{{item._id}}">
<a href="javascript:;" class="fontcolor second category">
<span class="tuodong">{{items.name}}</span>
<span class="tuodong" data-id="{{item._id}}">{{items.name}}</span>
{{# if(item.authority == "rw"){ }}
<img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}">
{{# } }}

13
web/src/jquery-ui.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

130
web/src/x.min.js vendored
View File

@ -1473,7 +1473,49 @@ var X = window.X || {
}
}
X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian');
X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian',function(){
// X.pageLogic.dashboard.sidebarslide();
var sidebar = document.getElementById('sidebar-boxhuadong');
new Sortable(sidebar, {
handle: '.tuodong', // handle class
animation: 150,
onUpdate:function(evt){
// console.log(evt);
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
var kbid = evt.item.attributes[3]['nodeValue'];
var index = 0;
for(let i in X.DATA['ProjectData']){
if(kbid == X.DATA['ProjectData'][i]['_id']){
index = i;
for(let j in X.DATA['ProjectData'][i]['children']){
if(j > newIndex){
X.DATA['ProjectData'][i]['children'][j]['sort'] = Number(X.DATA['ProjectData'][i]['children'][j]['sort']) + Number(1);
}else if(j == newIndex){
X.DATA['ProjectData'][i]['children'][j]['sort'] = Number(X.DATA['ProjectData'][i]['children'][j]['sort']) - Number(1);
}
}
}
}
X.DATA['ProjectData'][index]['children'][oldIndex]['sort'] = newIndex;
var sortarr = [];
for(let q in X.DATA['ProjectData'][index]['children']){
var arr = {
name: X.DATA['ProjectData'][index]['children'][q]['name'],
dashboard_id: X.DATA['ProjectData'][index]['children'][q]['_id'],
sort: X.DATA['ProjectData'][index]['children'][q]['sort']
}
sortarr.push(arr);
}
X.api('dashboard/sort','post',{sort:sortarr},function(d){
if(d == 1){
X.pageLogic.dashboard.freshMenu(X.DATA['projectid']);
}
})
}
});
});
X.DATA['page'] = urlinfo.page;
// console.log(urlinfo.page);
// console.log(urlinfo.menu);
@ -5919,6 +5961,7 @@ var X = window.X || {
me.freshMenu(X.DATA['projectid']);
// X.template("toptab","analysis-zhanwei",d);
});
// $(".username").html(X.DATA.userinfo.name);
@ -6666,50 +6709,75 @@ var X = window.X || {
}
}
}
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
$("#model-box").html("");
// 获取报表数据
X.pageLogic['dashboard'].gettabledata();
var sidebar = document.getElementById('sidebar-box'+d.spaces[0]['_id']);
new Sortable(sidebar, {
handle: '.tuodong', // handle class
animation: 150,
onUpdate:function(evt){
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
// console.log(d.spaces);
for(let j in d.spaces[i]['children']){
if(j >= newIndex){
d.spaces[i]['children'][j]['sort'] = Number(d.spaces[i]['children'][j]['sort']) + Number(1);
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian',function(){
// X.pageLogic.dashboard.sidebarslide();
// var sidebar = document.getElementById('sidebar-box'+d.spaces[0]['_id']);
var sidebar = document.getElementById('sidebar-boxhuadong');
new Sortable(sidebar, {
handle: '.tuodong', // handle class
animation: 150,
onUpdate:function(evt){
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
// console.log(d.spaces);
for(let j in d.spaces[i]['children']){
if(j >= newIndex){
d.spaces[i]['children'][j]['sort'] = Number(d.spaces[i]['children'][j]['sort']) + Number(1);
}
}
d.spaces[i]['children'][oldIndex]['sort'] = newIndex;
var sortarr = [];
for(let q in d.spaces[i]['children']){
var arr = {
dashboard_id: d.spaces[i]['children'][q]['_id'],
sort: d.spaces[i]['children'][q]['sort']
}
sortarr.push(arr);
}
X.api('dashboard/sort','post',{sort:sortarr},function(d){
if(d == 1){
X.pageLogic.dashboard.freshMenu(X.DATA['projectid']);
}
})
}
d.spaces[i]['children'][oldIndex]['sort'] = newIndex;
var sortarr = [];
for(let q in d.spaces[i]['children']){
var arr = {
dashboard_id: d.spaces[i]['children'][q]['_id'],
sort: d.spaces[i]['children'][q]['sort']
}
sortarr.push(arr);
}
X.api('dashboard/sort','post',{sort:sortarr},function(d){
if(d == 1){
X.pageLogic.dashboard.freshMenu(X.DATA['projectid']);
}
})
}
});
});
break;//终止循环
}
}
});
},
// 侧边栏上下滑动 废弃
sidebarslide:function(){
$('.sidebarslide').sortable({
connectWith: [".sidebarslide"],
placeholder: "drop-area",
distance: 15,
tolerance:'pointer',
opacity:0.8,
revert:100,
helper:'clone',
appendTo:'body',
start : function(event, ui){
console.log(111,event);
console.log(111,ui);
},
stop: function(event, ui){
console.log(222,event);
console.log(222,ui);
},
})
},
//填充看板数据
//总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
fillmodeldata:function(d,id,type){

44
web/srczip/base/ajaxpage.js
View File

@ -114,7 +114,49 @@
}
}
X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian');
X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian',function(){
// X.pageLogic.dashboard.sidebarslide();
var sidebar = document.getElementById('sidebar-boxhuadong');
new Sortable(sidebar, {
handle: '.tuodong', // handle class
animation: 150,
onUpdate:function(evt){
// console.log(evt);
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
var kbid = evt.item.attributes[3]['nodeValue'];
var index = 0;
for(let i in X.DATA['ProjectData']){
if(kbid == X.DATA['ProjectData'][i]['_id']){
index = i;
for(let j in X.DATA['ProjectData'][i]['children']){
if(j > newIndex){
X.DATA['ProjectData'][i]['children'][j]['sort'] = Number(X.DATA['ProjectData'][i]['children'][j]['sort']) + Number(1);
}else if(j == newIndex){
X.DATA['ProjectData'][i]['children'][j]['sort'] = Number(X.DATA['ProjectData'][i]['children'][j]['sort']) - Number(1);
}
}
}
}
X.DATA['ProjectData'][index]['children'][oldIndex]['sort'] = newIndex;
var sortarr = [];
for(let q in X.DATA['ProjectData'][index]['children']){
var arr = {
name: X.DATA['ProjectData'][index]['children'][q]['name'],
dashboard_id: X.DATA['ProjectData'][index]['children'][q]['_id'],
sort: X.DATA['ProjectData'][index]['children'][q]['sort']
}
sortarr.push(arr);
}
X.api('dashboard/sort','post',{sort:sortarr},function(d){
if(d == 1){
X.pageLogic.dashboard.freshMenu(X.DATA['projectid']);
}
})
}
});
});
X.DATA['page'] = urlinfo.page;
// console.log(urlinfo.page);
// console.log(urlinfo.menu);

86
web/srczip/logic/dashboard.js
View File

@ -41,6 +41,7 @@
me.freshMenu(X.DATA['projectid']);
// X.template("toptab","analysis-zhanwei",d);
});
// $(".username").html(X.DATA.userinfo.name);
@ -788,50 +789,75 @@
}
}
}
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
$("#model-box").html("");
// 获取报表数据
X.pageLogic['dashboard'].gettabledata();
var sidebar = document.getElementById('sidebar-box'+d.spaces[0]['_id']);
new Sortable(sidebar, {
handle: '.tuodong', // handle class
animation: 150,
onUpdate:function(evt){
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
// console.log(d.spaces);
for(let j in d.spaces[i]['children']){
if(j >= newIndex){
d.spaces[i]['children'][j]['sort'] = Number(d.spaces[i]['children'][j]['sort']) + Number(1);
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian',function(){
// X.pageLogic.dashboard.sidebarslide();
// var sidebar = document.getElementById('sidebar-box'+d.spaces[0]['_id']);
var sidebar = document.getElementById('sidebar-boxhuadong');
new Sortable(sidebar, {
handle: '.tuodong', // handle class
animation: 150,
onUpdate:function(evt){
var newIndex = evt.newIndex;
var oldIndex = evt.oldIndex;
// console.log(d.spaces);
for(let j in d.spaces[i]['children']){
if(j >= newIndex){
d.spaces[i]['children'][j]['sort'] = Number(d.spaces[i]['children'][j]['sort']) + Number(1);
}
}
d.spaces[i]['children'][oldIndex]['sort'] = newIndex;
var sortarr = [];
for(let q in d.spaces[i]['children']){
var arr = {
dashboard_id: d.spaces[i]['children'][q]['_id'],
sort: d.spaces[i]['children'][q]['sort']
}
sortarr.push(arr);
}
X.api('dashboard/sort','post',{sort:sortarr},function(d){
if(d == 1){
X.pageLogic.dashboard.freshMenu(X.DATA['projectid']);
}
})
}
d.spaces[i]['children'][oldIndex]['sort'] = newIndex;
var sortarr = [];
for(let q in d.spaces[i]['children']){
var arr = {
dashboard_id: d.spaces[i]['children'][q]['_id'],
sort: d.spaces[i]['children'][q]['sort']
}
sortarr.push(arr);
}
X.api('dashboard/sort','post',{sort:sortarr},function(d){
if(d == 1){
X.pageLogic.dashboard.freshMenu(X.DATA['projectid']);
}
})
}
});
});
break;//终止循环
}
}
});
},
// 侧边栏上下滑动 废弃
sidebarslide:function(){
$('.sidebarslide').sortable({
connectWith: [".sidebarslide"],
placeholder: "drop-area",
distance: 15,
tolerance:'pointer',
opacity:0.8,
revert:100,
helper:'clone',
appendTo:'body',
start : function(event, ui){
console.log(111,event);
console.log(111,ui);
},
stop: function(event, ui){
console.log(222,event);
console.log(222,ui);
},
})
},
//填充看板数据
//总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
fillmodeldata:function(d,id,type){

2
web/static/css/style.css
View File

@ -407,7 +407,7 @@ span.comboTreeItemTitle{display: block;padding: 2px 4px;}
.member-top-box .member-cha { cursor: pointer; }
.kongjian-box .member-box .member-top-box input { height: 32px; border: 0; padding: 0 8px; }
.member-box .member-top-box { padding: 6px 8px; display:flex; justify-content: space-around; align-content: center; }
.member-user-box { padding: 8px; overflow-y: scroll;}
.member-user-box { padding: 8px; overflow-y: scroll; max-height: 440px; }
.member-user-box .member-user-xm { height: 36px; padding-left: 8px; }
.member-user-con { cursor: pointer; display: flex; justify-content: space-between; align-items: center; }
.member-user-con-lefr { display: flex; padding: 8px; }