diff --git a/src/renderer/public/tree/jquery.ztree.excheck.js b/src/renderer/public/tree/jquery.ztree.excheck.js index 44b5336..7fda95e 100644 --- a/src/renderer/public/tree/jquery.ztree.excheck.js +++ b/src/renderer/public/tree/jquery.ztree.excheck.js @@ -101,7 +101,7 @@ nodeEventType = "mouseoutCheck"; } } else if (tools.eqs(e.type, "click")) { - if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) { + if (setting.check.enable && (tools.eqs(target.tagName, "span") || tools.eqs(target.tagName, "svg")) && target.getAttribute("treeNode" + consts.id.CHECK) !== null) { tId = tools.getNodeMainDom(target).id; nodeEventType = "checkNode"; } @@ -156,12 +156,18 @@ _beforeA = function (setting, node, html) { if (setting.check.enable) { data.makeChkFlag(setting, node); - html.push(""); + if(node.check_Child_State>0 || node.isShow) { + html.push("`); + } + else { + html.push("`); + } } }, //update zTreeObj, add method of check _zTreeTools = function (setting, zTreeTools) { zTreeTools.checkNode = function (node, checked, checkTypeFlag, callbackFlag) { + var nodeChecked = data.nodeChecked(setting, node); if (node.chkDisabled === true) return; if (checked !== true && checked !== false) { @@ -512,6 +518,12 @@ obj.show(); } obj.attr('class', view.makeChkClass(setting, node)); + if(node.check_Child_State>0 || node.isShow) { + obj.html(``) + } + else { + obj.html(``) + } }, setParentNodeCheckBox: function (setting, node, value, srcNode) { var checkObj = $$(node, consts.id.CHECK, setting); diff --git a/src/renderer/src/assets/images/tree/roots-close.png b/src/renderer/src/assets/images/tree/roots-close.png new file mode 100644 index 0000000..3879bd4 Binary files /dev/null and b/src/renderer/src/assets/images/tree/roots-close.png differ diff --git a/src/renderer/src/assets/images/tree/roots-open.png b/src/renderer/src/assets/images/tree/roots-open.png new file mode 100644 index 0000000..c9d6a99 Binary files /dev/null and b/src/renderer/src/assets/images/tree/roots-open.png differ diff --git a/src/renderer/src/assets/styles/global.css b/src/renderer/src/assets/styles/global.css index 0aac38a..3eea871 100644 --- a/src/renderer/src/assets/styles/global.css +++ b/src/renderer/src/assets/styles/global.css @@ -385,25 +385,47 @@ img { background: url(../images/tree/folder-empty.png) 0 0 no-repeat; background-size: 100% 100% !important; background-position: center !important; + margin: 0 6px 0 4px !important; } .ztree li span.button.ico_close { background: url(../images/tree/folder-close.png) 0 0 no-repeat; background-size: 100% 100% !important; background-position: center !important; + margin: 0 6px 0 4px !important; } .ztree li span.button.ico_open { background: url(../images/tree/folder-open.png) 0 0 no-repeat; background-size: 100% 100% !important; background-position: center !important; + margin: 0 6px 0 4px !important; } .ztree li span.button.ico_docu:not([style=""]) { background-size: 90% 90% !important; background-position: center !important; + margin: 0 6px 0 4px !important; /* margin-top: 1px; */ } +.ztree li ul.line { + background: none !important; +} +.ztree li span.button.switch, +.ztree li span.button.chk { + background: none; +} +.ztree li span.button.roots_open, .ztree li span.button.bottom_open { + background: url(../images/tree/roots-open.png) 0 0 no-repeat; + background-position: center !important; +} +.ztree li span.button.roots_close, .ztree li span.button.bottom_close { + background: url(../images/tree/roots-close.png) 0 0 no-repeat; + background-position: center !important; +} +.ztree li span.button.switch { + margin-right: 5px; +} #app { .ztree * { diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index fcaf18f..296b494 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -37,6 +37,30 @@
+ + + + + + + + + + + + + + + 记住密码 @@ -344,11 +368,29 @@ onMounted(() => { color: rgba(0, 66, 66, 1); background-color: rgba(var(--color-base1), 1); border: none; + border-radius: 0; } .el-button.is-loading:before { background-color: rgb(116 230 249 / 8%); } + + .checkbox-svg { + position: absolute; + top: 9px; + left: 0; + } + + ::v-deep .el-checkbox { + .el-checkbox__input { + opacity: 0; + } + + .el-checkbox__label { + color: #fff; + } + } + } } } @@ -540,6 +582,7 @@ onMounted(() => { width: 166px; height: 40px; border-radius: 0; + ::v-deep span { font-weight: 500; }