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 3c8a6df3daa2d9950003f4e0b20e9e8e2ded2939..737d875cb3c0e350e09185b33156d132221dfd60 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,8 @@ function server(){ }), createProxyMiddleware( '/builder',{ - target: 'http://11.2.251.48:8211' + // 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/css/zTreeStyle/img/icon_new.png b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon_new.png index 91243806e95dc05a49987e37b86202f8fe75f6b0..d961e0d91bc0cd97bf534df06c3565059d9aa033 100644 Binary files a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon_new.png and b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon_new.png differ diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png index f3b43cd6e2b39ef924a7c3d81221c204fb99f7bb..629f2f5bd90f4ba44b315fbc6fe885d190d0fea0 100644 Binary files a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png and b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png differ 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 693c9f9d97d49165b91bf70584398c8e9ab998c4..d1fdf80c05901632af73f30c083f53823a417885 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/icon.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/icon.css index db6bf8cb3e6e389d25d86d366628579000d16f93..0d9939cc50458dc4d39dce4f626631bf95873690 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/icon.css +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/icon.css @@ -37,16 +37,22 @@ } /* 领域模型 */ -#editor .ztree li a span.button.domain_type_ico_close, -#editor .ztree li a span.button.domain_type_ico_open { +/* TODO存疑 */ + +#editor .ztree li a span.button.domain_ico_docu, +#editor .ztree li a span.button.domain_ico_close, +#editor .ztree li a span.button.domain_ico_open, +#editor .ztree li a span.button.modelentity_ico_close, +#editor .ztree li a span.button.modelentity_ico_open, +#editor .ztree li a span.button.modelentity_ico_docu { background-position: -26px -29px; } /* 领域模型类型 */ -#editor .ztree li a span.button.modelentity_ico_close, -#editor .ztree li a span.button.modelentity_ico_open, -#editor .ztree li a span.button.modelentity_ico_docu { +#editor .ztree li a span.button.domain_type_ico_docu, +#editor .ztree li a span.button.domain_type_ico_close, +#editor .ztree li a span.button.domain_type_ico_open { background-position: -55px -29px; } @@ -71,7 +77,7 @@ } /* 页面模型类型 */ -/* TODO */ +#editor .ztree li a span.button.page_type_ico_docu, #editor .ztree li a span.button.page_type_ico_close, #editor .ztree li a span.button.page_type_ico_open { background-position: -119px -111px; @@ -193,6 +199,13 @@ background-position: -240px -138px; } +/* 值对象 */ +#editor .ztree li a span.button.domain_vo_ico_docu, +#editor .ztree li a span.button.domain_vo_ico_close, +#editor .ztree li a span.button.domain_vo_ico_open { + background-position: -27px -193px; +} + /* 流程对象树 */ /* 流程对象 */ #editor .ztree li a span.button.workflow_model_type_ico_docu, @@ -202,12 +215,15 @@ } /* 模型分类关闭 */ -#editor .ztree li a span.button.category_open_ico_close { +#editor .ztree li a span.button.folder_ico_docu, +#editor .ztree li a span.button.folder_ico_close, +#editor .ztree li a span.button.category_ico_close { background-position: -87px -83px; } /* 模型分裂展开 */ -#editor .ztree li a span.button.category_open_ico_open { +#editor .ztree li a span.button.folder_ico_open, +#editor .ztree li a span.button.category_ico_open { background-position: -119px -83px; } @@ -383,12 +399,21 @@ } /* 数据规则 */ -#editor .ztree li a span.button.data_rule_docu, -#editor .ztree li a span.button.data_rule_open, -#editor .ztree li a span.button.data_rule_close { +#editor .ztree li a span.button.data_rule_ico_docu, +#editor .ztree li a span.button.data_rule_ioc_open, +#editor .ztree li a span.button.data_rule_ico_close { background-position: -414px -110px; } +/* 菜单目录 */ +#editor .ztree li a span.button.menu_catalog_ico_docu, +#editor .ztree li a span.button.menu_catalog_ico_open, +#editor .ztree li a span.button.menu_catalog_ico_close { + background-position: -150px -110px; +} + + + /* 规则树 */ /* 规则项目 */ #editor .ztree li a span.button.rule_project_ico_docu, @@ -465,180 +490,4 @@ #editor .ztree li a span.button.rule_variable_ico_open, #editor .ztree li a span.button.rule_variable_ico_close { background-position: -411px -165px; -} - -/* 右键图标 */ -.layui-menu li .icon { - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; -} - -/* 新增 */ -.layui-menu li .add, -.layui-menu li .create { - background-position: -18px -186px -} - -/* */ -.layui-menu li .edit { - background-position: -54px -186px; -} - -/* */ -.layui-menu li .delete { - background-position: -91px -186px; -} - -/* */ -.layui-menu li .detail { - background-position: -126px -186px; -} - -/* */ -.layui-menu li .download_model { - background-position: -162px -186px; -} - -/* */ -.layui-menu li .import_model { - background-position: -198px -187px; -} - -/* */ -.layui-menu li .gen_domain { - background-position: -234px -187px; -} - -/* */ -.layui-menu li .gen_sql { - background-position: -270px -188px; -} - -/* */ -.layui-menu li .gen_code { - background-position: -305px -187px; -} - -/* */ -.layui-menu li .gen_page { - background-position: -343px -187px; -} - -/* */ -.layui-menu li .gen_json { - background-position: -377px -187px; -} - -/* */ -.layui-menu li .version_publish { - background-position: -414px -187px; -} - -/* */ -.layui-menu li .version_list { - background-position: -18px -223px; -} - -/* */ -.layui-menu li .export_insert_sql { - background-position: -54px -223px; -} - -/* */ -.layui-menu li .his_record { - background-position: -90px -223px; -} - -/* */ -.layui-menu li .copy_url { - background-position: -126px -223px; -} - -/* */ -.layui-menu li .test { - background-position: -162px -223px; -} - -/* */ -.layui-menu li .create_domain { - background-position: -198px -223px; -} - -/* */ -.layui-menu li .create_vo { - background-position: -233px -223px; -} - -/* */ -.layui-menu li .create_domain_field { - background-position: -270px -224px; -} - -/* */ -.layui-menu li .create_page { - background-position: -305px -225px; -} - -/* */ -.layui-menu li .create_flow_form { - background-position: -341px -225px; -} - -/* */ -.layui-menu li .create_folder { - background-position: -378px -225px; -} - -/* */ -.layui-menu li .create_datasource { - background-position: -414px -225px; -} - -/* */ -.layui-menu li .create_value_gen { - background-position: -19px -265px; -} - -/* */ -.layui-menu li .create_dd { - background-position: -53px -265px; -} - -/* */ -.layui-menu li .create_dd_item { - background-position: -89px -256.5px; -} - -/* */ -.layui-menu li .create_mdm { - background-position: -125px -257px; -} - -/* */ -.layui-menu li .create_menu { - background-position: -161px -256px; -} - -/* */ -.layui-menu li .publish { - background-position: -198px -256px; -} - -/* */ -.layui-menu li .suspend { - background-position: -234px -257px; -} - -/* */ -.layui-menu li .recovery { - background-position: -270px -256.5px; -} - -/* */ -.layui-menu li .export { - background-position: -306px -255.5px; -} - -/* */ -.layui-menu li .copy { - background-position: -341px -256px; } \ No newline at end of file diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/jqGride.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/jqGride.css new file mode 100644 index 0000000000000000000000000000000000000000..da38b08e5d7dcae91b16c1f0d24b365616568ef8 --- /dev/null +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/jqGride.css @@ -0,0 +1,52 @@ +.pq-grid-cont-inner>table>tbody>tr>td>a { + width: 18px; + height: 18px; + display: inline-block; + margin: 3px 3px 0 3px; +} +.pq-grid-cont-inner>table>tbody>tr>td>a:hover { + background-color: #ddd; +} + +.pq-grid-cont-inner>table>tbody>tr>td>.divider { + width: 0.5px; + height: 17px; + display: inline-block; + background-color: #333; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.icon { + + background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; + width: 18px; + height: 18px; + display: inline-block; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.create { + background-position: -20px -441px; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.delete { + background-position: -89px -440.5px; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.edit { + background-position: -54px -441px; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.copy { + background-position: -125px -441px; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.move_up { + background-position: -160px -442px; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.move_down { + background-position: -193px -442px; +} + +.pq-grid-cont-inner>table>tbody>tr>td>a>.setting { + background-position: -227px -442px; +} \ No newline at end of file diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/rightClick.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/rightClick.css new file mode 100644 index 0000000000000000000000000000000000000000..8f368c8dfda5fb0fd4371a636ee06c5944a4202c --- /dev/null +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/rightClick.css @@ -0,0 +1,191 @@ +/* 右键图标 */ +.layui-menu li .icon { + background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; +} + +/* 新增 */ +.layui-menu li .add, +.layui-menu li .create { + background-position: -18px -186px +} + +/* */ +.layui-menu li .edit { + background-position: -54px -186px; +} + +/* */ +.layui-menu li .delete { + background-position: -89px -186px; +} + +/* */ +.layui-menu li .detail { + background-position: -126px -186px; +} + +/* */ +.layui-menu li .download_model { + background-position: -162px -186px; +} + +/* */ +.layui-menu li .import_model { + background-position: -198px -187px; +} + +/* */ +.layui-menu li .gen_domain { + background-position: -234px -186px; +} + +/* */ +.layui-menu li .gen_sql { + background-position: -270px -188px; +} + +/* */ +.layui-menu li .gen_code { + background-position: -18px -222px; +} + +/* */ +.layui-menu li .gen_page { + /* -342px -187px */ + background-position: -305px -186px; +} + +/* */ +.layui-menu li .gen_json { + background-position: -341px -187px; +} + +/* 版本发布 */ +.layui-menu li .version_publish { + background-position: -378px -187px; +} + +/* 版本列表 */ +.layui-menu li .version_list { + background-position: -414px -187px; +} + +/* */ +.layui-menu li .export_insert_sql { + background-position: -54px -223px; +} + +/* */ +.layui-menu li .his_record { + background-position: -90px -223px; +} + +/* */ +.layui-menu li .copy_url { + background-position: -127px -223px; +} + +/* */ +.layui-menu li .test { + background-position: -162px -223px; +} + +/* */ +.layui-menu li .create_domain { + background-position: -198px -223px; +} + +/* */ +.layui-menu li .create_vo { + background-position: -234px -223px; +} + +/* */ +.layui-menu li .create_domain_field { + background-position: -270px -224px; +} + +/* */ +.layui-menu li .create_page { + background-position: -305px -225px; +} + +/* */ +.layui-menu li .create_flow_form { + background-position: -341px -225px; +} + +/* */ +.layui-menu li .create_folder { + background-position: -378px -225px; +} + +/* */ +.layui-menu li .create_datasource { + background-position: -414px -225px; +} + +/* */ +.layui-menu li .create_value_gen { + background-position: -19px -265px; +} + +/* */ +.layui-menu li .create_dd { + background-position: -53px -265px; +} + +/* */ +.layui-menu li .create_dd_item { + background-position: -89px -256.5px; +} + +/* */ +.layui-menu li .create_mdm { + background-position: -125px -257px; +} + +/* */ +.layui-menu li .create_menu { + background-position: -161px -256px; +} + +/* */ +.layui-menu li .publish { + background-position: -198px -257px; +} + +/* */ +.layui-menu li .suspend { + background-position: -234px -257px; +} + +/* */ +.layui-menu li .recovery { + background-position: -270px -256.5px; +} + +/* */ +.layui-menu li .export { + background-position: -306px -255.5px; +} + +/* */ +.layui-menu li .copy { + background-position: -341px -256px; +} + +/* 查看版本 */ +.layui-menu li .check_version { + background-position: -414px -256px; +} + +/* 设计 */ +.layui-menu li .page_design { + background-position: -379px -255px; +} + +/* 新增下级 */ +/* .layui-menu li . { + background-position: -341px -256px; +} */ \ No newline at end of file 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 e989703e51925e80ea2d1415969f54675351e96e..79fccf855d90b7ed46cd3ffea3fded63d2dae56b 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 @@ -615,99 +615,7 @@ div.pq-toolbar { padding: 0 10px; } -.layui-layout-right .review { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon.png) no-repeat scroll 0 0 transparent; - background-position: -112px -131px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} - -/* 设计器工具栏 */ -.layui-layout-right>.layui-nav-item>.save { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; - background-position: -15px -20px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} -.layui-layout-right>.layui-nav-item> .design { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; - background-position: -49px -20px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} - -.layui-layout-right>.layui-nav-item> .publish { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; - background-position: -85px -20px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} - -.layui-layout-right>.layui-nav-item> .preview { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; - background-position: -121px -19px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} - -.layui-layout-right>.layui-nav-item> .run { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; - background-position: -158px -18px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} - -.layui-layout-right>.layui-nav-item> .debug { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; - background-position: -193px -18px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} - -.layui-layout-right>.layui-nav-item> .stop { - height: 26px; - width: 26px; - display: inline-block; - background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; - background-position: -229px -18px; - cursor: pointer; - margin-right: 3px; - /* border-radius: 50%; */ -} - - -/* .layui-layout-right>.layui-nav-item>a> .layui-nav-item a:hover{ - color: rgb(0,167,255); -} */ .layui-side .layui-tab-title { height: 65px; padding-top: 0; @@ -983,7 +891,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 +903,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; @@ -1051,6 +959,14 @@ ul.layui-menu { .layui-layer-btn .layui-layer-btn0:hover { color: #fff; } + .amis-scope .cxd-Crud-selectionClear:hover { background-color: transparent; +} +.layui-tab-brief>.layui-tab-title .layui-this { + color: #fff; + background: rgb(79,158,238); +} +.pear-tab .layui-tab-title .layui-this .pear-tab-active { + background-color: rgb(79,158,238); } \ No newline at end of file diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/tab.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/tab.css index b13d5657215d032cef9141adb950f03d580bf9e3..68f73deadf3cb3be117198063ba80ab4d99bae60 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/tab.css +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/tab.css @@ -67,7 +67,7 @@ } .pear-tab .layui-tab-title .layui-this .pear-tab-active { - background-color: #5FB878; + background-color: rgb(79,158,238); } .pear-tab .layui-tab-title .layui-tab-close:hover { diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/tabBar.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/tabBar.css new file mode 100644 index 0000000000000000000000000000000000000000..4d159099e087eedb2798e5c1531053d189fe382e --- /dev/null +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/tabBar.css @@ -0,0 +1,132 @@ +.layui-layout-right .icon { + height: 26px; + width: 26px; + display: inline-block; + background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/right_icon.png) no-repeat scroll 0 0 transparent; + margin-right: 3px; + margin-top: 2px; +} + +/* 激活态鼠标悬浮 */ +.layui-layout-right .save_active:hover, +.layui-layout-right .preview_active:hover, +.layui-layout-right .design_active:hover, +.layui-layout-right .publish_active:hover, +.layui-layout-right .run_active:hover, +.layui-layout-right .debug_active:hover, +.layui-layout-right .debug_active:hover, +.layui-layout-right .stop_active:hover { + background-color: #ddd; +} + +/* 激活态光标 */ +.layui-layout-right .save_active, +.layui-layout-right .preview_active, +.layui-layout-right .design_active, +.layui-layout-right .publish_active, +.layui-layout-right .run_active, +.layui-layout-right .debug_active, +.layui-layout-right .debug_active, +.layui-layout-right .stop_active { + cursor: pointer; +} + +/* 激活态 */ +.layui-layout-right .save_active { + background-position: -15px -51px; +} + +.layui-layout-right .preview_active { + background-position: -123px -51px; +} + +.layui-layout-right .design_active { + background-position: -50px -51px; +} + +.layui-layout-right .publish_active { + background-position: -87px -51px; +} + +.layui-layout-right .run_active { + background-position: -157px -51px; +} + +.layui-layout-right .debug_active { + background-position: -190px -51px; +} + +.layui-layout-right .stop_active { + background-position: -224px -51px; +} + +/* 禁用态光标 */ +.layui-layout-right .save_disabled, +.layui-layout-right .preview_disabled, +.layui-layout-right .design_disabled, +.layui-layout-right .publish_disabled, +.layui-layout-right .run_disabled, +.layui-layout-right .debug_disabled, +.layui-layout-right .debug_disabled, +.layui-layout-right .stop_disabled { + cursor: default; +} + +/* 禁用态 */ +.layui-layout-right .save_disabled { + background-position: -15px -19px; +} + +.layui-layout-right .preview_disabled { + background-position: -123px -18px; +} + +.layui-layout-right .design_disabled { + background-position: -50px -19px; +} + +.layui-layout-right .publish_disabled { + background-position: -87px -19px; +} + +.layui-layout-right .run_disabled { + background-position: -157px -19px; +} + +.layui-layout-right .debug_disabled { + background-position: -190px -19px; +} + +.layui-layout-right .stop_disabled { + background-position: -224px -19px; +} + +/* .layui-layout-right .review { + height: 26px; + width: 26px; + display: inline-block; + background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon.png) no-repeat scroll 0 0 transparent; + background-position: -112px -131px; + cursor: pointer; + margin-right: 3px; + border-radius: 50%; +} */ + +/* 设计器工具栏 */ + + + + + + + + + + + + + + +/* .layui-layout-right a> .layui-nav-item a:hover{ + color: rgb(0,167,255); +} */ \ No newline at end of file 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 5b535ca6b26f69314a339e825044362e00377192..7f1417caccef728cbf44f507c24a4fac0b66d5d8 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 a36ef7021a74527d04c55759d85356530b0fc0a7..ba5f081cea90cd951a143002f77fac1a72c2eb61 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 @@ -1,10 +1,11 @@ + Fast Develop Designer - + @@ -25,272 +26,276 @@ + -
- +
+ - - - - - + + + + + - + - - - + + - - - + + + + }) + + \ No newline at end of file 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 1a0a1cbf3440703f587dbef1174473ef029d09af..57348d2a8c1eefcdc37e286ba442ff0eba2e1de7 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 = ` -
+
xxxx@qq.com 2021.12.23 zhangsan diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design_business.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design_business.js index 13ea2dbbd63599e04b62473a3d8d6ff89a754a34..f2f0e464da0bd6c4148ed59a10e2aab2b9168f76 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design_business.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design_business.js @@ -1,35 +1,34 @@ -layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) { - "use strict"; - - /** - * Button component - * */ - var MOD_NAME = 'domain_design_business', - $ = layui.jquery, +layui.define(['element', 'api', 'fast_config', 'utils', 'form'], function (exports) { + "use strict"; + + /** + * Button component + * */ + var MOD_NAME = 'domain_design_business', + $ = layui.jquery, api = layui.api, fast_config = layui.fast_config, form = layui.form, utils = layui.utils, - rowIndex - ; + rowIndex; - var domain_design_business = function(opt) { - this.option = opt; - }; + var domain_design_business = function (opt) { + this.option = opt; + }; - var initFieldDate = function(option) { + var initFieldDate = function (option) { option.fields = {}; } - function openModel(rowIndx,rowdata,grid){ + function openModel(rowIndx, rowdata, grid) { // console.log("aaa",rowdata); layer.open({ - type:1, + type: 1, title: "设置", offset: '30%', zIndex: 100, - success: function (){ - form.render(null,'myForm'); + success: function () { + form.render(null, 'myForm'); }, content: `
@@ -54,46 +53,54 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) `, shade: 0.3, btn: ['提交', '取消'], - btn1:function (index, layero) { + btn1: function (index, layero) { let formData = form.val('myForm'); - rowdata = {...rowdata,...formData} + rowdata = { + ...rowdata, + ...formData + } // let upIndx = rowIndx-1; - grid.deleteRow({rowIndx:rowIndx}); - grid.addRow({newRow:rowdata,rowIndx:rowIndx}) + grid.deleteRow({ + rowIndx: rowIndx + }); + grid.addRow({ + newRow: rowdata, + rowIndx: rowIndx + }) grid.getData(); layer.closeAll(); }, - btn2: function(){ + btn2: function () { layer.closeAll(); }, - cancel: function(layero,index){ + cancel: function (layero, index) { layer.closeAll(); } }); } - layui.use(['form'], function() { - form=layui.form; - form.on('select(type)', function(data){ - var val=data.value; + layui.use(['form'], function () { + form = layui.form; + form.on('select(type)', function (data) { + var val = data.value; console.info(val); $("#dval").html(""); - if(val == "Constant" || val == "EL"){ + if (val == "Constant" || val == "EL") { $("#dval").append(``); } - if(val == "Sequence"){ + if (val == "Sequence") { let seqhtml = ``; let op = ''; api.exec({ - enableRootPath:true, + enableRootPath: true, type: "GET", url: utils.stringformat(fast_config.app.seqApi), - success: function(data){ - for(let i=0;i${data[i].seq}`; + success: function (data) { + for (let i = 0; i < data.length; i++) { + op = op + ``; } } }); @@ -108,19 +115,19 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) }); /** - * Button start loading - * */ - domain_design_business.prototype.render = function(opt) { - - var option = { - elem: opt.elem, - initData:opt.initData, + * Button start loading + * */ + domain_design_business.prototype.render = function (opt) { + + var option = { + elem: opt.elem, + initData: opt.initData, grid: null - } + } initFieldDate(option); - var grid; + var grid; var parentContextData = window.parent.window.contextData; // var path = parentContextData.contextmenuData.data.path; var metaName; @@ -172,9 +179,13 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) return false; } - if ( grid.isDirty() && grid.isValidChange({ focusInvalid: true }).valid ) { + if (grid.isDirty() && grid.isValidChange({ + focusInvalid: true + }).valid) { - var changes = grid.getChanges({ format: "byVal" }); + var changes = grid.getChanges({ + format: "byVal" + }); //post changes to server api.post({ @@ -188,13 +199,26 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) url: "/meta/" + metaName + "/batch", // contextT data: JSON.stringify(changes), - headers:{'Content-Type':'application/json;charset=utf8'}, + headers: { + 'Content-Type': 'application/json;charset=utf8' + }, success: function (changes) { - grid.commit({ type: 'add', rows: changes.addList }); - grid.commit({ type: 'update', rows: changes.updateList }); - grid.commit({ type: 'delete', rows: changes.deleteList }); + grid.commit({ + type: 'add', + rows: changes.addList + }); + grid.commit({ + type: 'update', + rows: changes.updateList + }); + grid.commit({ + type: 'delete', + rows: changes.deleteList + }); - grid.history({ method: 'reset' }); + grid.history({ + method: 'reset' + }); }, complete: function () { grid.hideLoading(); @@ -206,22 +230,34 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) //获取url中的参数 function getUrlParam(url, name) { var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象 - var r = url.substr(1).match(reg); //匹配目标参数 - if (r != null) return unescape(r[2]); return null; //返回参数值 + var r = url.substr(1).match(reg); //匹配目标参数 + if (r != null) return unescape(r[2]); + return null; //返回参数值 } - var types = [ - {"id":"basic","value":"basic","name": "基础类型"}, - {"id":"dd","value":"dd", "name": "数据字典"}, - {"id":"mdm","value":"mdm", "name": "基础数据"} + var types = [{ + "id": "basic", + "value": "basic", + "name": "基础类型" + }, + { + "id": "dd", + "value": "dd", + "name": "数据字典" + }, + { + "id": "mdm", + "value": "mdm", + "name": "基础数据" + } ]; - var data=[]; - if(option.initData){ + var data = []; + if (option.initData) { data = option.initData; - for(var field of data){ - if(field["validationTypeList"]!= undefined && field["validationTypeList"].length>0){ - for(var vali of field["validationTypeList"]){ + for (var field of data) { + if (field["validationTypeList"] != undefined && field["validationTypeList"].length > 0) { + for (var vali of field["validationTypeList"]) { field[vali] = true; } } @@ -232,14 +268,16 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) } - function getFieldClass(type){ - if(!option.fields[type]){ + function getFieldClass(type) { + if (!option.fields[type]) { api.exec({ - enableRootPath:true, + enableRootPath: true, type: "GET", // url: fast_config.domain.fieldClassApi+type, - url: fast_config.moudle.domain.fieldClassApi.format({type:type}), - success: function(data){ + url: fast_config.moudle.domain.fieldClassApi.format({ + type: type + }), + success: function (data) { // console.log("data",JSON.parse(data)); option.fields[type] = data; } @@ -249,9 +287,9 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) return option.fields[type]; } - var fieldClass = function (ui){ - let type=ui.rowData.fieldType; - if(type==''){ + var fieldClass = function (ui) { + let type = ui.rowData.fieldType; + if (type == '') { type = "basic"; } return getFieldClass(type); @@ -261,44 +299,75 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) hwrap: false, virtualX: true, rowBorders: false, - trackModel: { on: true }, //to turn on the track changes. + trackModel: { + on: true + }, //to turn on the track changes. // selectionModel: { type: 'row' }, - selectionModel: { type: null }, + selectionModel: { + type: null + }, toolbar: { - items: [ - { type: 'button', icon: 'ui-icon-plus', label: '', + items: [{ + type: 'button', + icon: 'ui-icon-plus', + label: '', listener: function () { //append empty row at the end. - let i = grid.getData().length+1; - let rowData = { fieldComment: "字段"+i, fieldName: "field"+i, columnName: "", fieldType: "basic", fieldClass: "String",canExcel:false,apiHide:false}; //default row - let rowIndx = grid.addRow( { rowData: rowData, checkEditable: true }); - grid.goToPage({ rowIndx: rowIndx }); - grid.editFirstCellInRow({ rowIndx: rowIndx }); + let i = grid.getData().length + 1; + let rowData = { + fieldComment: "字段" + i, + fieldName: "field" + i, + columnName: "", + fieldType: "basic", + fieldClass: "String", + canExcel: false, + apiHide: false + }; //default row + let rowIndx = grid.addRow({ + rowData: rowData, + checkEditable: true + }); + grid.goToPage({ + rowIndx: rowIndx + }); + grid.editFirstCellInRow({ + rowIndx: rowIndx + }); } }, - { type: 'button', icon: 'ui-icon-close', label: '', + { + type: 'button', + icon: 'ui-icon-close', + label: '', listener: function () { - //debugger - if(rowIndex !=null){ + //debugger + if (rowIndex != null) { layer.confirm('确认删除选中数据？', { - title:"删除字段", - btn: ['确认','取消'] //按钮 - }, function(){ - let selarray = grid.selection({ type: 'row', method: 'getSelection' }), - checked=[]; + title: "删除字段", + btn: ['确认', '取消'] //按钮 + }, function () { + let selarray = grid.selection({ + type: 'row', + method: 'getSelection' + }), + checked = []; for (var i = 0, len = selarray.length; i < len; i++) { - checked.push({rowIndx:selarray[i].rowIndx}); + checked.push({ + rowIndx: selarray[i].rowIndx + }); } - grid.deleteRow({rowList: checked}); + grid.deleteRow({ + rowList: checked + }); rowIndex = null; layer.closeAll(); layer.msg('操作成功'); - }, function(){ + }, function () { layer.closeAll(); }); - }else{ + } else { layer.alert('请先选择行！'); } } @@ -315,28 +384,46 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) rowIndex = address; // $("#select_change_div").html(JSON.stringify(address)); }, - swipeModel: { on: false, type: null }, + swipeModel: { + on: false, + type: null + }, editor: { select: true }, - bootstrap: { on : false }, - height:'flex', + bootstrap: { + on: false + }, + height: 'flex', showTitle: false, - title: ""+metaName+"", + title: "" + metaName + "", history: function (evt, ui) { var $tb = this.toolbar(); if (ui.canUndo != null) { - $("button.changes", $tb).button("option", { disabled: !ui.canUndo }); + $("button.changes", $tb).button("option", { + disabled: !ui.canUndo + }); } if (ui.canRedo != null) { $("button:contains('Redo')", $tb).button("option", "disabled", !ui.canRedo); } - $("button:contains('Undo')", $tb).button("option", { label: 'Undo (' + ui.num_undo + ')' }); - $("button:contains('Redo')", $tb).button("option", { label: 'Redo (' + ui.num_redo + ')' }); + $("button:contains('Undo')", $tb).button("option", { + label: 'Undo (' + ui.num_undo + ')' + }); + $("button:contains('Redo')", $tb).button("option", { + label: 'Redo (' + ui.num_redo + ')' + }); }, - colModel: [ - { dataIndx: "state", maxWidth: 30, minWidth: 30, align: "center", resizable: false, - type: 'checkBoxSelection', cls: 'ui-state-default', sortable: false, editor: false, + colModel: [{ + dataIndx: "state", + maxWidth: 30, + minWidth: 30, + align: "center", + resizable: false, + type: 'checkBoxSelection', + cls: 'ui-state-default', + sortable: false, + editor: false, dataType: 'bool', cb: { all: true, @@ -344,31 +431,58 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) select: true } }, - { title: "名称", width: 200, dataType: "string", dataIndx: "fieldComment", - validations: [{ type: 'minLen', value: "1", msg: "必填"}] + { + title: "名称", + width: 200, + dataType: "string", + dataIndx: "fieldComment", + validations: [{ + type: 'minLen', + value: "1", + msg: "必填" + }] }, - { title: "英文名", width: 200, dataType: "string", dataIndx: "fieldName", - validations: [{ type: 'minLen', value: "1", msg: "必填"}] + { + title: "英文名", + width: 200, + dataType: "string", + dataIndx: "fieldName", + validations: [{ + type: 'minLen', + value: "1", + msg: "必填" + }] }, - { title: "表字段", width: 200, dataType: "string", dataIndx: "columnName"}, - { title: "类别", width: 220, dataType: "string", dataIndx: "fieldType", + { + title: "表字段", + width: 200, + dataType: "string", + dataIndx: "columnName" + }, + { + title: "类别", + width: 220, + dataType: "string", + dataIndx: "fieldType", editor: { type: "select", labelIndx: "name", valueIndx: "id", - prepend: { "": "" }, + prepend: { + "": "" + }, options: types }, // validations: [{ type: 'minLen', value: "1", msg: "必填"}], - render : function (ui) { + render: function (ui) { var rowData = ui.rowData, dataIndx = ui.dataIndx; rowData.pq_cellcls = rowData.pq_cellcls || {}; let name = null; - $.each(types,function(index,obj){ - if(rowData[dataIndx] == obj.id){ + $.each(types, function (index, obj) { + if (rowData[dataIndx] == obj.id) { name = obj.name return true; } @@ -376,30 +490,35 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) return name; } }, - { title: "字段类型", dataIndx: "fieldClass", width: 220, + { + title: "字段类型", + dataIndx: "fieldClass", + width: 220, editor: { type: "select", labelIndx: "name", valueIndx: "code", - prepend: { "": "" }, + prepend: { + "": "" + }, options: fieldClass }, // validations: [{ type: 'minLen', value: "1", msg: "必填"}], - render : function (ui) { + render: function (ui) { var rowData = ui.rowData, dataIndx = ui.dataIndx; rowData.pq_cellcls = rowData.pq_cellcls || {}; - let type=ui.rowData.fieldType; - if(type==''){ + let type = ui.rowData.fieldType; + if (type == '') { type = "basic"; } let fcls = getFieldClass(type) let name = null; - $.each(fcls,function(index,obj){ - if(rowData[dataIndx] == obj.code){ + $.each(fcls, function (index, obj) { + if (rowData[dataIndx] == obj.code) { name = obj.name return true; } @@ -407,71 +526,118 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) return name; } }, - { title: "长度", width: 100, dataType: "integer", dataIndx: "length"}, - { title: "关键字", width: 100, dataType: "bool", align: "center", dataIndx: "Keyword", + { + title: "长度", + width: 100, + dataType: "integer", + dataIndx: "length" + }, + { + title: "关键字", + width: 100, + dataType: "bool", + align: "center", + dataIndx: "Keyword", editor: false, type: 'checkbox' }, - { title: "唯一", width: 100, dataType: "bool", align: "center", dataIndx: "Repeat", + { + title: "唯一", + width: 100, + dataType: "bool", + align: "center", + dataIndx: "Repeat", editor: false, type: 'checkbox' }, - { title: "非空", width: 100, dataType: "bool", align: "center", dataIndx: "NotEmpty", + { + title: "非空", + width: 100, + dataType: "bool", + align: "center", + dataIndx: "NotEmpty", editor: false, type: 'checkbox' }, - { title: "可导出", width: 100, dataType: "bool", align: "center", dataIndx: "canExcel", + { + title: "可导出", + width: 100, + dataType: "bool", + align: "center", + dataIndx: "canExcel", editor: false, type: 'checkbox', - validations: [{ type: 'nonEmpty', msg: "Required"}] + validations: [{ + type: 'nonEmpty', + msg: "Required" + }] }, - { title: "隐藏参数", width: 100, dataType: "bool", align: "center", dataIndx: "apiHide", + { + title: "隐藏参数", + width: 100, + dataType: "bool", + align: "center", + dataIndx: "apiHide", editor: false, type: 'checkbox', - validations: [{ type: 'nonEmpty', msg: "Required"}] + validations: [{ + type: 'nonEmpty', + msg: "Required" + }] }, - { title: "操作", editable: false, width: 220, sortable: false, + { + title: "操作", + editable: false, + width: 220, + sortable: false, render: function (ui) { // debugger - if(ui.rowIndx==0){ - return `设置 | 复制 | 下移`; + if (ui.rowIndx == 0) { + return ``; } - if(ui.rowIndx==data.length-1){ - return `设置 | 复制 | 上移`; + if (ui.rowIndx == data.length - 1) { + return ``; } - if(ui.rowIndx>0 && ui.rowIndx设置 | 复制 | 上移 | 下移`; + if (ui.rowIndx > 0 && ui.rowIndx < data.length - 1) { + return ``; // return `\\ // `; } }, postRender: function (ui) { - let copyData = {...{},...ui.rowData}, - copyIndx=ui.rowIndx+1, + let copyData = { + ...{}, + ...ui.rowData + }, + copyIndx = ui.rowIndx + 1, grid = this, $cell = grid.getCell(ui); - copyData.fieldComment = copyData.fieldComment+"copy"; - copyData.fieldName = copyData.fieldName+"copy"; + copyData.fieldComment = copyData.fieldComment + "copy"; + copyData.fieldName = copyData.fieldName + "copy"; - if(copyData.columnName !== undefined && copyData.columnName !== "" ){ - copyData.columnName = copyData.columnName+"copy"; + if (copyData.columnName !== undefined && copyData.columnName !== "") { + copyData.columnName = copyData.columnName + "copy"; } - copyData.pq_rowselect=undefined;copyData.state=false; + copyData.pq_rowselect = undefined; + copyData.state = false; //copy button $cell.find(".copy_btn") // .button({ icons: { primary: 'ui-icon-copy'} }) .bind("click", function (evt) { - grid.addRow({ newRow: copyData, rowIndx: copyIndx }); + grid.addRow({ + newRow: copyData, + rowIndx: copyIndx + }); }); //edit button $cell.find(".edit_btn") // .button({ icons: { primary: 'ui-icon-pencil'} }) .bind("click", function (evt) { - openModel(ui.rowIndx,ui.rowData,grid); - form.val('myForm',ui.rowData ); + openModel(ui.rowIndx, ui.rowData, grid); + form.val('myForm', ui.rowData); }); //up button @@ -479,51 +645,69 @@ layui.define(['element', 'api', 'fast_config','utils','form'], function(exports) // .button({ icons: { primary: 'ui-icon-arrowthick-1-n'} }) .bind("click", function (evt) { // debugger - let upIndx = ui.rowIndx-1,cruIndx = ui.rowIndx, - upData = grid.getRowData({rowIndx: upIndx}); - grid.deleteRow({rowIndx: upIndx}); - grid.addRow({newRow:upData,rowIndx:cruIndx}) + let upIndx = ui.rowIndx - 1, + cruIndx = ui.rowIndx, + upData = grid.getRowData({ + rowIndx: upIndx + }); + grid.deleteRow({ + rowIndx: upIndx + }); + grid.addRow({ + newRow: upData, + rowIndx: cruIndx + }) }); //down button $cell.find(".down_btn") // .button({ icons: { primary: 'ui-icon-arrowthick-1-s'} }) .bind("click", function (evt) { - let downIndx = ui.rowIndx+1,cruIndx = ui.rowIndx, - downData = grid.getRowData({rowIndx: cruIndx}); - grid.deleteRow({rowIndx: cruIndx}); - grid.addRow({newRow:downData,rowIndx:downIndx}) + let downIndx = ui.rowIndx + 1, + cruIndx = ui.rowIndx, + downData = grid.getRowData({ + rowIndx: cruIndx + }); + grid.deleteRow({ + rowIndx: cruIndx + }); + grid.addRow({ + newRow: downData, + rowIndx: downIndx + }) }); } } ], postRenderInterval: -1, //call postRender synchronously. // pageModel: { type: "remote", rPP: 20 }, - create: function(){ + create: function () { this.widget().pqTooltip(); }, - dataModel:{data: data} + dataModel: { + data: data + } }; - var gridModel = function (){ + var gridModel = function () { var self = this - self.editRow = function( rd ){ + self.editRow = function (rd) { self.reset(); }; - self.reset = function(){ - copy( master, self.company); + self.reset = function () { + copy(master, self.company); self.focus(true); }; } - grid = pq.grid( option.elem, obj ); + grid = pq.grid(option.elem, obj); option.grid = grid; return new domain_design_business(option); - } + } exports(MOD_NAME, new domain_design_business()); -}); +}); \ No newline at end of file diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_toolbar.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_toolbar.js index 6c726831dc9d9a4cbb6bc07ce7f0de6f1beb8304..bfa9bf52c30fd2bfd76fbf8af10a0098a1581915 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_toolbar.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_toolbar.js @@ -5,8 +5,7 @@ layui.define([], function (exports) { listeners = layui.listener, schema_render = layui.schema_render, resource_toolbar_option, - $ = layui.jquery - ; + $ = layui.jquery; /** @@ -15,8 +14,8 @@ layui.define([], function (exports) { * @param {*} treeId * @param {*} treeNode */ - function resource_toolbar_resourceTreeClickListener(event, treeId, treeNode, option, pearBody, resource_tabs_obj){ - + function resource_toolbar_resourceTreeClickListener(event, treeId, treeNode, option, pearBody, resource_tabs_obj) { + var treeObj = $.fn.zTree.getZTreeObj(treeId) var schemaType = treeObj.setting.view.schemaType; @@ -24,28 +23,30 @@ layui.define([], function (exports) { var resourceTypeSchema = schema.get(schemaType); var typeSchema = resourceTypeSchema[metaType]; - if(typeSchema.toolbar){ - removeDom({elem: '.header-right'}); + if (typeSchema.toolbar) { + removeDom({ + elem: '.header-right' + }); + - var toolbar = { elem: '.header-right', treeNode: treeNode, - schemaType:schemaType, + schemaType: schemaType, } - - if(treeNode){ + + if (treeNode) { var metaType = treeNode.data.type.metaType; var resourceTypeSchema = schema.getResource(schemaType); var typeSchema = resourceTypeSchema[metaType]; - - if(typeSchema.toolbar){ + + if (typeSchema.toolbar) { addDom(resource_toolbar_option, typeSchema.toolbar, toolbar); } } - + } } @@ -53,22 +54,44 @@ layui.define([], function (exports) { /** * 模块装配 */ - function configur(){ + function configur() { listeners.registerResourceTreeClickListener('resource_toolbar_resourceTreeClickListener', resource_toolbar_resourceTreeClickListener); } - var resource_toolbar = function(opt) { + var resource_toolbar = function (opt) { this.option = opt; }; - - function removeDom(option){ + + function removeDom(option) { $(option.elem).empty(); } - + function addDom(option, toolbarSchema, toolbar) { + var tabBarList = [ + + { + "type": "span", + "tooltip": "预览", + "label": "", + "mode": "action", + "action": { + "componentId": "", + "args": { + "url": option.previewApi, + "blank": false + }, + "actionType": "url" + }, + "icon": "icon preview_active" + }, + + + ] + /* 顶部工具栏 */ + /* var preview = { "type": "span", "tooltip":"预览", @@ -82,11 +105,16 @@ layui.define([], function (exports) { }, "actionType": "url" }, - "icon": "preview" + "icon": "icon preview" } - - var formatToolbarSchema= $.extend(true, [], toolbarSchema); - formatToolbarSchema.push(preview) + */ + + var formatToolbarSchema = $.extend(true, [], toolbarSchema); + + // formatToolbarSchema.push(preview) + tabBarList.forEach((item) => { + formatToolbarSchema.push(item) + }) var idPreFix = "resource_toolbar_"; @@ -118,14 +146,14 @@ layui.define([], function (exports) { ` - //
  • - // preview - //
    • - + //
  • + // preview + //
    • + $(option.elem).append(dom); - $(".layui-layout-right").children(":first").find("span").click(function(event){ + $(".layui-layout-right").children(":first").find("span").click(function (event) { var toolbrObj = toolbar; var schemaItemIndex = event.target.id.slice(idPreFix.length); var spanSchema = formatToolbarSchema[schemaItemIndex]; @@ -136,30 +164,30 @@ layui.define([], function (exports) { - function action(event, spanSchema, toolbrObj){ + function action(event, spanSchema, toolbrObj) { var id = event.target.id; - if(spanSchema.mode === 'listener'){ + if (spanSchema.mode === 'listener') { var listenerName; - if(spanSchema.listenerName){ + if (spanSchema.listenerName) { listenerName = spanSchema.listenerName; - }else{ + } else { listenerName = id + '_toolbar_listener'; } var listener = listeners.getToolbarListener(listenerName); - if(listener && typeof listener === 'function'){ + if (listener && typeof listener === 'function') { listener(event, spanSchema, toolbrObj) } - }else{ + } else { var schemaRenderOption = { schema: spanSchema } - if(toolbrObj){ + if (toolbrObj) { schemaRenderOption.contextData = toolbrObj.treeNode } schema_render.render(schemaRenderOption); } - + } @@ -254,7 +282,7 @@ layui.define([], function (exports) { } addDom(opt, toolbarSchema); - + resource_toolbar_option = opt; @@ -263,4 +291,4 @@ layui.define([], function (exports) { configur(); exports(MOD_NAME, new resource_toolbar()); -}); +}); \ No newline at end of file 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 77540d923c327639c1e42aeaa493051eacb57ab1..83b71e51d33bb58e0c72f391b25c644b0a40b67d 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 @@ -449,12 +449,18 @@ layui.define(['jquery', 'element'], function (exports) { if (nextNode.length) { nextNode.addClass("layui-this"); currId = nextNode.attr("lay-id"); - $("#" + elem + " [id='" + currId + "']").parent().addClass("layui-show"); + $("#" + elem + " [id='treenode_" + currId + "']").parent().addClass("layui-show"); } else { var prevNode = removeTab.prev("li"); prevNode.addClass("layui-this"); currId = prevNode.attr("lay-id"); - $("#" + elem + " [id='" + currId + "']").parent().addClass("layui-show"); + console.log(currId,'currId') + if(currId === 'dashbord'){ + $("#" + elem + " .layui-tab-content>.layui-tab-item").addClass("layui-show"); + }else { + $("#" + elem + " [id='treenode_" + currId + "']").parent().addClass("layui-show"); + } + } callback(currId); tabData = JSON.parse(sessionStorage.getItem(elem + "-pear-tab-data"));