From 78cd720d37f83b4d82746c816bb41f698ab13dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=91=E4=BA=9A=E6=9D=83?= <673583240@qq.com>
Date: Thu, 1 Sep 2022 16:49:01 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=A0=91=E8=8F=9C=E5=8D=95menu=E7=B1=BB?=
=?UTF-8?q?=E5=9E=8B=E7=AE=AD=E5=A4=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/fast-develop/gulpfile.js | 2 +-
.../@ztree/ztree_v3/js/jquery.ztree.extend.js | 25 +++++++++++++++----
.../src/fast-develop/src/css/style1.css | 4 +--
.../src/fast-develop/src/css/treeReset.css | 1 +
.../src/fast-develop/src/index_gs.html | 1 -
.../src/js/module/app/editor/footer.js | 2 +-
6 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
index 3c8a6df..3a59a31 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
@@ -198,7 +198,7 @@ function server(){
}),
createProxyMiddleware(
'/builder',{
- target: 'http://11.2.251.48:8211'
+ target: 'http://11.2.251.48:8210'
}),
createProxyMiddleware(
'/api', {
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js
index 693c9f9..d1fdf80 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js
@@ -855,11 +855,14 @@
console.log('setting.view',setting.view)
if(setting.view.treeMode === 'menu'){
if(node.open && node.isParent){
- treeObj.expandNode(node, false, true, true);
- $('#'+node.tId+'_a').find('.layui-icon').removeClass('layui-icon-down').addClass('layui-icon-right')
+ treeObj.expandNode(node, false, false, true);
+ // 抽函数
+ view.menuFloderClose(node.tId)
+ // $('#'+node.tId+'_a').find('.layui-icon').removeClass('layui-icon-down').addClass('layui-icon-right')
} else {
treeObj.expandNode(node, true, false, true);
- $('#'+node.tId+'_a').find('.layui-icon').removeClass('layui-icon-right').addClass('layui-icon-down')
+ view.menuFloderOpen(node.tId)
+ // $('#'+node.tId+'_a').find('.layui-icon').removeClass('layui-icon-right').addClass('layui-icon-down')
}
}
// 清除掉所有树的节点激活效果
@@ -984,6 +987,12 @@
},
//method of operate ztree dom
view = {
+ menuFloderClose: function(id){
+ $('#'+id+'_a').find('.layui-icon').removeClass('layui-icon-down').addClass('layui-icon-right')
+ },
+ menuFloderOpen: function(id){
+ $('#'+id+'_a').find('.layui-icon').removeClass('layui-icon-right').addClass('layui-icon-down')
+ },
resetStyle: function(setting){
$('#'+setting.treeId+' .treeNodeDiv').each(function(){
var num = $(this).parents('ul').length;
@@ -1026,6 +1035,9 @@
view.selectedNextNode(treeObj,selectedNode,setting,event)
} else {
treeObj.expandNode(selectedNode, true, false, true);
+ if(setting.view.treeMode === 'menu'){
+ view.menuFloderOpen(selectedNode.tId)
+ }
}
} else {
view.selectedNextNode(treeObj,selectedNode,setting,event)
@@ -1039,7 +1051,10 @@
// 高亮该节点的父节点
if(selectedNode.isParent){ // 文件夹
if(selectedNode.open){
- treeObj.expandNode(selectedNode, false, true, true);
+ treeObj.expandNode(selectedNode, false, false, true);
+ if(setting.view.treeMode === 'menu'){
+ view.menuFloderClose(selectedNode.tId)
+ }
} else {
var parentNode = selectedNode.getParentNode()
if(!parentNode && selectedNode.getIndex() !== 0){
@@ -1549,7 +1564,7 @@
"' style='", view.makeNodeIcoStyle(setting, node), "'>", name, saveText, "");
- if(node.data.type === 'CATALOG') {
+ if(node.data.type === 'CATALOG' && node.children) {
html.push(' ')
}
},
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css
index e989703..3815145 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css
@@ -983,7 +983,7 @@ ul.layui-menu {
display: inline-block;
}
-.layui-layout-admin .layui-footer {
+.layui-layout-admin .footer {
position: static;
border-top: 1px solid var(--system-main-borderColor);
left: 0px;
@@ -995,7 +995,7 @@ ul.layui-menu {
font-size: 12px;
}
-.layui-layout-admin .layui-footer span {
+.layui-layout-admin .footer span {
margin-left: 15px;
font-weight: 700;
color: #666;
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/treeReset.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/treeReset.css
index 5b535ca..7f1417c 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/treeReset.css
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/treeReset.css
@@ -60,6 +60,7 @@ ul.ztree li>div {
width: 100%;
}
ul.ztree li>div a {
+ width: 100%;
width: calc(100% - 18px);
}
/* ul.ztree li.menuTree,
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html
index a36ef70..6820977 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html
@@ -205,7 +205,6 @@
id: appId,
//该字段内可增加额外要增加的header全局字段
ajaxHeaderParams:{},
-
contentSettings:{
enableConsole: true,
editorSettings: {
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/app/editor/footer.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/app/editor/footer.js
index 1a0a1cb..57348d2 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/app/editor/footer.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/app/editor/footer.js
@@ -17,7 +17,7 @@ layui.define(['element', 'api','utils','amis'], function(exports) {
function addDom(option){
var dom = `
-