+
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
index 5c8f48ca94ed5b92f47e214a76a9d2e0cf9fdd03..b5d838ac110543c4a8571b793ff4b709817f9605 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
@@ -93,7 +93,16 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'ztree', 'utils'],
close: true,
title: title,
id: id
- })
+ }
+ // ,function(){
+ // $('.amis-scope').each(function(index,item){
+ // console.log(index)
+ // if(index !== 0){
+ // $(item).removeClass('amis-scope')
+ // }
+ // })
+ // }
+ )
sessionStorage.setItem( "content-pear-current-treeNode", JSON.stringify(data));
} else {
$('#fast-body').show()
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
index c1434c25d10a6396bc973818183fa8870dd7a0d3..99bf5463271907df9c9377f04e3b7031382370d5 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
@@ -532,7 +532,8 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
view: {
onKeyboard: true,
showLine: false,
- theme:'default'
+ theme:'default',
+ keepActiveParentNode:'.box1'
},
check: {
enable: true
@@ -701,7 +702,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
}
})
pearBody.click(function(id) {
- console.log(id)
+
})
} else {
$('#content').hide()
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js
index a2c64f074a07f8cf01dec193e438b19a000ddd99..879cb94363826ea85cfaa502cc25a1a0ed5e0180 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js
@@ -96,7 +96,7 @@ layui.define(['jquery', 'element','resource_content','utils','ztree'], function(
shade: false,
skin: 'pear-tab-menu',
closeBtn: false,
- area: [menuWidth + 'px', '150px'],
+ area: [menuWidth + 'px', '123px'],
fixed: true,
anim: false,
isOutAnim: false,
@@ -300,7 +300,7 @@ layui.define(['jquery', 'element','resource_content','utils','ztree'], function(
}
/** 添 加 唯 一 选 项 卡 */
- pearTab.prototype.addTabOnly = function(opt, time) {
+ pearTab.prototype.addTabOnly = function(opt, callback,time) {
var title = '';
if (opt.close) {
title += '' + opt.title +
@@ -360,9 +360,11 @@ layui.define(['jquery', 'element','resource_content','utils','ztree'], function(
sessionStorage.setItem(this.option.elem + "-pear-tab-data-current", opt.id);
}
}
- console.log(this.option.elem, opt.id,'999999')
element.tabChange(this.option.elem, opt.id);
this.positionTab()
+ if(callback){
+ callback()
+ }
sessionStorage.setItem(this.option.elem + "-pear-tab-data-current", opt.id);
}
@@ -401,14 +403,12 @@ layui.define(['jquery', 'element','resource_content','utils','ztree'], function(
//根据 elem id 来删除指定的 layui title li
var tabTitle = $(".layui-tab[lay-filter='" + elem + "']").find(".layui-tab-title");
- console.log(id,'id')
// 删除指定 id 的 title
var removeTab = tabTitle.find("li[lay-id='" + id + "']");
var nextNode = removeTab.next("li");
if (!removeTab.hasClass("layui-this")) {
removeTab.remove();
var tabContent = $(".layui-tab[lay-filter='" + elem + "']").find("div[id='treenode_" + id + "']").parent();
- console.log('treenode_'+id,'9999999')
tabContent.remove();
tabData = JSON.parse(sessionStorage.getItem(elem + "-pear-tab-data"));
@@ -629,7 +629,6 @@ layui.define(['jquery', 'element','resource_content','utils','ztree'], function(
})
$("body .layui-tab[lay-filter='" + option.elem + "']").on("click", "#closeAll", function() {
- console.log('向下箭头')
var currentId = $(".layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title .layui-this").attr("lay-id");
var tabtitle = $(".layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title li");
$.each(tabtitle, function(i) {
@@ -640,19 +639,8 @@ layui.define(['jquery', 'element','resource_content','utils','ztree'], function(
})
$("body .layui-tab[lay-filter='" + option.elem + "']").on("click", "#refersh", function() {
- console.log('向下箭头')
var currentId = $(".layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title .layui-this").attr("lay-id");
- console.log(currentId,'currentId')
option.refersh(currentId)
- // var treeNode = JSON.parse(sessionStorage.getItem("content-pear-current-treeNode"))
- // var schemaType = JSON.parse(sessionStorage.getItem("content-schemaType"))
- // resource_content.render({
- // elem:'#treenode_'+currentId,
- // treeNode: treeNode,
- // viewMode:'tabs',
- // amisData: utils.getGlobalEnv(treeNode.data),
- // schemaType:schemaType
- // })
})
}