7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #589 from veops/dev_ui_240807 

Dev UI 240807
This commit is contained in:
Leo Song 2024-08-07 14:42:01 +08:00 committed by GitHub
parent f280603d00 41d7cdf4d2
commit 5c8f050585
12 changed files with 1114 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

719
cmdb-ui/public/iconfont/demo_index.html
View File

@ -54,6 +54,192 @@
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe995;</span>
<div class="name">duose-quote</div>
<div class="code-name">&amp;#xe995;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe996;</span>
<div class="name">duose-boole</div>
<div class="code-name">&amp;#xe996;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe994;</span>
<div class="name">veops-rule1</div>
<div class="code-name">&amp;#xe994;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe993;</span>
<div class="name">veops-operation_report</div>
<div class="code-name">&amp;#xe993;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe992;</span>
<div class="name">veops-ranking1</div>
<div class="code-name">&amp;#xe992;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe98f;</span>
<div class="name">veops-ranking2</div>
<div class="code-name">&amp;#xe98f;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe990;</span>
<div class="name">veops-ranking3</div>
<div class="code-name">&amp;#xe990;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe991;</span>
<div class="name">veops-ranking4</div>
<div class="code-name">&amp;#xe991;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe98d;</span>
<div class="name">veops-title5</div>
<div class="code-name">&amp;#xe98d;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe98e;</span>
<div class="name">veops-repair (1)</div>
<div class="code-name">&amp;#xe98e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe988;</span>
<div class="name">veops-ticket</div>
<div class="code-name">&amp;#xe988;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe989;</span>
<div class="name">veops-model4</div>
<div class="code-name">&amp;#xe989;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe98a;</span>
<div class="name">veops-resource2 (1)</div>
<div class="code-name">&amp;#xe98a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe98b;</span>
<div class="name">veops-relationship3</div>
<div class="code-name">&amp;#xe98b;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe98c;</span>
<div class="name">veops-title6</div>
<div class="code-name">&amp;#xe98c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe97a;</span>
<div class="name">veops-resource1 (1)</div>
<div class="code-name">&amp;#xe97a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe97b;</span>
<div class="name">veops-model1 (1)</div>
<div class="code-name">&amp;#xe97b;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe97c;</span>
<div class="name">veops-relationship1</div>
<div class="code-name">&amp;#xe97c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe97d;</span>
<div class="name">veops-title1</div>
<div class="code-name">&amp;#xe97d;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe97e;</span>
<div class="name">veops-title2</div>
<div class="code-name">&amp;#xe97e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe97f;</span>
<div class="name">veops-model2</div>
<div class="code-name">&amp;#xe97f;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe980;</span>
<div class="name">veops-resource2</div>
<div class="code-name">&amp;#xe980;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe981;</span>
<div class="name">veops-warehousing</div>
<div class="code-name">&amp;#xe981;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe982;</span>
<div class="name">veops-relationship2</div>
<div class="code-name">&amp;#xe982;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe983;</span>
<div class="name">veops-title3</div>
<div class="code-name">&amp;#xe983;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe984;</span>
<div class="name">veops-rule2</div>
<div class="code-name">&amp;#xe984;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe985;</span>
<div class="name">veops-model3</div>
<div class="code-name">&amp;#xe985;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe986;</span>
<div class="name">veops-title4</div>
<div class="code-name">&amp;#xe986;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe987;</span>
<div class="name">veops-rule3</div>
<div class="code-name">&amp;#xe987;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe978;</span>
<div class="name">veops-decline</div>
<div class="code-name">&amp;#xe978;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe979;</span>
<div class="name">veops-rise</div>
<div class="code-name">&amp;#xe979;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe96f;</span>
<div class="name">caise-数据中心</div>
@ -5322,9 +5508,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1721959219377') format('woff2'),
url('iconfont.woff?t=1721959219377') format('woff'),
url('iconfont.ttf?t=1721959219377') format('truetype');
src: url('iconfont.woff2?t=1723012344599') format('woff2'),
url('iconfont.woff?t=1723012344599') format('woff'),
url('iconfont.ttf?t=1723012344599') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -5350,6 +5536,285 @@
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont duose-quote"></span>
<div class="name">
duose-quote
</div>
<div class="code-name">.duose-quote
</div>
</li>
<li class="dib">
<span class="icon iconfont duose-boole"></span>
<div class="name">
duose-boole
</div>
<div class="code-name">.duose-boole
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-rule1"></span>
<div class="name">
veops-rule1
</div>
<div class="code-name">.veops-rule1
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-operation_report"></span>
<div class="name">
veops-operation_report
</div>
<div class="code-name">.veops-operation_report
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-ranking1"></span>
<div class="name">
veops-ranking1
</div>
<div class="code-name">.veops-ranking1
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-ranking2"></span>
<div class="name">
veops-ranking2
</div>
<div class="code-name">.veops-ranking2
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-ranking3"></span>
<div class="name">
veops-ranking3
</div>
<div class="code-name">.veops-ranking3
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-ranking4"></span>
<div class="name">
veops-ranking4
</div>
<div class="code-name">.veops-ranking4
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-title5"></span>
<div class="name">
veops-title5
</div>
<div class="code-name">.veops-title5
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-repair1"></span>
<div class="name">
veops-repair (1)
</div>
<div class="code-name">.veops-repair1
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-ticket"></span>
<div class="name">
veops-ticket
</div>
<div class="code-name">.veops-ticket
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-model4"></span>
<div class="name">
veops-model4
</div>
<div class="code-name">.veops-model4
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-resource21"></span>
<div class="name">
veops-resource2 (1)
</div>
<div class="code-name">.veops-resource21
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-relationship3"></span>
<div class="name">
veops-relationship3
</div>
<div class="code-name">.veops-relationship3
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-title6"></span>
<div class="name">
veops-title6
</div>
<div class="code-name">.veops-title6
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-resource11"></span>
<div class="name">
veops-resource1 (1)
</div>
<div class="code-name">.veops-resource11
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-model11"></span>
<div class="name">
veops-model1 (1)
</div>
<div class="code-name">.veops-model11
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-relationship1"></span>
<div class="name">
veops-relationship1
</div>
<div class="code-name">.veops-relationship1
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-title1"></span>
<div class="name">
veops-title1
</div>
<div class="code-name">.veops-title1
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-title2"></span>
<div class="name">
veops-title2
</div>
<div class="code-name">.veops-title2
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-model2"></span>
<div class="name">
veops-model2
</div>
<div class="code-name">.veops-model2
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-resource2"></span>
<div class="name">
veops-resource2
</div>
<div class="code-name">.veops-resource2
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-warehousing"></span>
<div class="name">
veops-warehousing
</div>
<div class="code-name">.veops-warehousing
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-relationship2"></span>
<div class="name">
veops-relationship2
</div>
<div class="code-name">.veops-relationship2
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-title3"></span>
<div class="name">
veops-title3
</div>
<div class="code-name">.veops-title3
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-rule2"></span>
<div class="name">
veops-rule2
</div>
<div class="code-name">.veops-rule2
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-model3"></span>
<div class="name">
veops-model3
</div>
<div class="code-name">.veops-model3
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-title4"></span>
<div class="name">
veops-title4
</div>
<div class="code-name">.veops-title4
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-rule3"></span>
<div class="name">
veops-rule3
</div>
<div class="code-name">.veops-rule3
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-decline"></span>
<div class="name">
veops-decline
</div>
<div class="code-name">.veops-decline
</div>
</li>
<li class="dib">
<span class="icon iconfont veops-rise"></span>
<div class="name">
veops-rise
</div>
<div class="code-name">.veops-rise
</div>
</li>
<li class="dib">
<span class="icon iconfont caise-data_center"></span>
<div class="name">
@ -13252,6 +13717,254 @@
<div class="content symbol">
<ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#duose-quote"></use>
</svg>
<div class="name">duose-quote</div>
<div class="code-name">#duose-quote</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#duose-boole"></use>
</svg>
<div class="name">duose-boole</div>
<div class="code-name">#duose-boole</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-rule1"></use>
</svg>
<div class="name">veops-rule1</div>
<div class="code-name">#veops-rule1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-operation_report"></use>
</svg>
<div class="name">veops-operation_report</div>
<div class="code-name">#veops-operation_report</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-ranking1"></use>
</svg>
<div class="name">veops-ranking1</div>
<div class="code-name">#veops-ranking1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-ranking2"></use>
</svg>
<div class="name">veops-ranking2</div>
<div class="code-name">#veops-ranking2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-ranking3"></use>
</svg>
<div class="name">veops-ranking3</div>
<div class="code-name">#veops-ranking3</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-ranking4"></use>
</svg>
<div class="name">veops-ranking4</div>
<div class="code-name">#veops-ranking4</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-title5"></use>
</svg>
<div class="name">veops-title5</div>
<div class="code-name">#veops-title5</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-repair1"></use>
</svg>
<div class="name">veops-repair (1)</div>
<div class="code-name">#veops-repair1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-ticket"></use>
</svg>
<div class="name">veops-ticket</div>
<div class="code-name">#veops-ticket</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-model4"></use>
</svg>
<div class="name">veops-model4</div>
<div class="code-name">#veops-model4</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-resource21"></use>
</svg>
<div class="name">veops-resource2 (1)</div>
<div class="code-name">#veops-resource21</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-relationship3"></use>
</svg>
<div class="name">veops-relationship3</div>
<div class="code-name">#veops-relationship3</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-title6"></use>
</svg>
<div class="name">veops-title6</div>
<div class="code-name">#veops-title6</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-resource11"></use>
</svg>
<div class="name">veops-resource1 (1)</div>
<div class="code-name">#veops-resource11</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-model11"></use>
</svg>
<div class="name">veops-model1 (1)</div>
<div class="code-name">#veops-model11</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-relationship1"></use>
</svg>
<div class="name">veops-relationship1</div>
<div class="code-name">#veops-relationship1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-title1"></use>
</svg>
<div class="name">veops-title1</div>
<div class="code-name">#veops-title1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-title2"></use>
</svg>
<div class="name">veops-title2</div>
<div class="code-name">#veops-title2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-model2"></use>
</svg>
<div class="name">veops-model2</div>
<div class="code-name">#veops-model2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-resource2"></use>
</svg>
<div class="name">veops-resource2</div>
<div class="code-name">#veops-resource2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-warehousing"></use>
</svg>
<div class="name">veops-warehousing</div>
<div class="code-name">#veops-warehousing</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-relationship2"></use>
</svg>
<div class="name">veops-relationship2</div>
<div class="code-name">#veops-relationship2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-title3"></use>
</svg>
<div class="name">veops-title3</div>
<div class="code-name">#veops-title3</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-rule2"></use>
</svg>
<div class="name">veops-rule2</div>
<div class="code-name">#veops-rule2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-model3"></use>
</svg>
<div class="name">veops-model3</div>
<div class="code-name">#veops-model3</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-title4"></use>
</svg>
<div class="name">veops-title4</div>
<div class="code-name">#veops-title4</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-rule3"></use>
</svg>
<div class="name">veops-rule3</div>
<div class="code-name">#veops-rule3</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-decline"></use>
</svg>
<div class="name">veops-decline</div>
<div class="code-name">#veops-decline</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#veops-rise"></use>
</svg>
<div class="name">veops-rise</div>
<div class="code-name">#veops-rise</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#caise-data_center"></use>

130
cmdb-ui/public/iconfont/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 3857903 */
src: url('iconfont.woff2?t=1721959219377') format('woff2'),
url('iconfont.woff?t=1721959219377') format('woff'),
url('iconfont.ttf?t=1721959219377') format('truetype');
src: url('iconfont.woff2?t=1723012344599') format('woff2'),
url('iconfont.woff?t=1723012344599') format('woff'),
url('iconfont.ttf?t=1723012344599') format('truetype');
}
.iconfont {
@ -13,6 +13,130 @@
-moz-osx-font-smoothing: grayscale;
}
.duose-quote:before {
content: "\e995";
}
.duose-boole:before {
content: "\e996";
}
.veops-rule1:before {
content: "\e994";
}
.veops-operation_report:before {
content: "\e993";
}
.veops-ranking1:before {
content: "\e992";
}
.veops-ranking2:before {
content: "\e98f";
}
.veops-ranking3:before {
content: "\e990";
}
.veops-ranking4:before {
content: "\e991";
}
.veops-title5:before {
content: "\e98d";
}
.veops-repair1:before {
content: "\e98e";
}
.veops-ticket:before {
content: "\e988";
}
.veops-model4:before {
content: "\e989";
}
.veops-resource21:before {
content: "\e98a";
}
.veops-relationship3:before {
content: "\e98b";
}
.veops-title6:before {
content: "\e98c";
}
.veops-resource11:before {
content: "\e97a";
}
.veops-model11:before {
content: "\e97b";
}
.veops-relationship1:before {
content: "\e97c";
}
.veops-title1:before {
content: "\e97d";
}
.veops-title2:before {
content: "\e97e";
}
.veops-model2:before {
content: "\e97f";
}
.veops-resource2:before {
content: "\e980";
}
.veops-warehousing:before {
content: "\e981";
}
.veops-relationship2:before {
content: "\e982";
}
.veops-title3:before {
content: "\e983";
}
.veops-rule2:before {
content: "\e984";
}
.veops-model3:before {
content: "\e985";
}
.veops-title4:before {
content: "\e986";
}
.veops-rule3:before {
content: "\e987";
}
.veops-decline:before {
content: "\e978";
}
.veops-rise:before {
content: "\e979";
}
.caise-data_center:before {
content: "\e96f";
}

2
cmdb-ui/public/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

217
cmdb-ui/public/iconfont/iconfont.json
View File

@ -5,6 +5,223 @@
"css_prefix_text": "",
"description": "",
"glyphs": [
{
"icon_id": "41363381",
"name": "duose-quote",
"font_class": "duose-quote",
"unicode": "e995",
"unicode_decimal": 59797
},
{
"icon_id": "41363378",
"name": "duose-boole",
"font_class": "duose-boole",
"unicode": "e996",
"unicode_decimal": 59798
},
{
"icon_id": "41341306",
"name": "veops-rule1",
"font_class": "veops-rule1",
"unicode": "e994",
"unicode_decimal": 59796
},
{
"icon_id": "41337509",
"name": "veops-operation_report",
"font_class": "veops-operation_report",
"unicode": "e993",
"unicode_decimal": 59795
},
{
"icon_id": "41335526",
"name": "veops-ranking1",
"font_class": "veops-ranking1",
"unicode": "e992",
"unicode_decimal": 59794
},
{
"icon_id": "41335530",
"name": "veops-ranking2",
"font_class": "veops-ranking2",
"unicode": "e98f",
"unicode_decimal": 59791
},
{
"icon_id": "41335529",
"name": "veops-ranking3",
"font_class": "veops-ranking3",
"unicode": "e990",
"unicode_decimal": 59792
},
{
"icon_id": "41335528",
"name": "veops-ranking4",
"font_class": "veops-ranking4",
"unicode": "e991",
"unicode_decimal": 59793
},
{
"icon_id": "41334746",
"name": "veops-title5",
"font_class": "veops-title5",
"unicode": "e98d",
"unicode_decimal": 59789
},
{
"icon_id": "41334744",
"name": "veops-repair (1)",
"font_class": "veops-repair1",
"unicode": "e98e",
"unicode_decimal": 59790
},
{
"icon_id": "41334753",
"name": "veops-ticket",
"font_class": "veops-ticket",
"unicode": "e988",
"unicode_decimal": 59784
},
{
"icon_id": "41334751",
"name": "veops-model4",
"font_class": "veops-model4",
"unicode": "e989",
"unicode_decimal": 59785
},
{
"icon_id": "41334752",
"name": "veops-resource2 (1)",
"font_class": "veops-resource21",
"unicode": "e98a",
"unicode_decimal": 59786
},
{
"icon_id": "41334750",
"name": "veops-relationship3",
"font_class": "veops-relationship3",
"unicode": "e98b",
"unicode_decimal": 59787
},
{
"icon_id": "41334748",
"name": "veops-title6",
"font_class": "veops-title6",
"unicode": "e98c",
"unicode_decimal": 59788
},
{
"icon_id": "41334404",
"name": "veops-resource1 (1)",
"font_class": "veops-resource11",
"unicode": "e97a",
"unicode_decimal": 59770
},
{
"icon_id": "41334505",
"name": "veops-model1 (1)",
"font_class": "veops-model11",
"unicode": "e97b",
"unicode_decimal": 59771
},
{
"icon_id": "41334533",
"name": "veops-relationship1",
"font_class": "veops-relationship1",
"unicode": "e97c",
"unicode_decimal": 59772
},
{
"icon_id": "41334535",
"name": "veops-title1",
"font_class": "veops-title1",
"unicode": "e97d",
"unicode_decimal": 59773
},
{
"icon_id": "41334572",
"name": "veops-title2",
"font_class": "veops-title2",
"unicode": "e97e",
"unicode_decimal": 59774
},
{
"icon_id": "41334579",
"name": "veops-model2",
"font_class": "veops-model2",
"unicode": "e97f",
"unicode_decimal": 59775
},
{
"icon_id": "41334590",
"name": "veops-resource2",
"font_class": "veops-resource2",
"unicode": "e980",
"unicode_decimal": 59776
},
{
"icon_id": "41334594",
"name": "veops-warehousing",
"font_class": "veops-warehousing",
"unicode": "e981",
"unicode_decimal": 59777
},
{
"icon_id": "41334598",
"name": "veops-relationship2",
"font_class": "veops-relationship2",
"unicode": "e982",
"unicode_decimal": 59778
},
{
"icon_id": "41334602",
"name": "veops-title3",
"font_class": "veops-title3",
"unicode": "e983",
"unicode_decimal": 59779
},
{
"icon_id": "41334603",
"name": "veops-rule2",
"font_class": "veops-rule2",
"unicode": "e984",
"unicode_decimal": 59780
},
{
"icon_id": "41334604",
"name": "veops-model3",
"font_class": "veops-model3",
"unicode": "e985",
"unicode_decimal": 59781
},
{
"icon_id": "41334725",
"name": "veops-title4",
"font_class": "veops-title4",
"unicode": "e986",
"unicode_decimal": 59782
},
{
"icon_id": "41334739",
"name": "veops-rule3",
"font_class": "veops-rule3",
"unicode": "e987",
"unicode_decimal": 59783
},
{
"icon_id": "41334004",
"name": "veops-decline",
"font_class": "veops-decline",
"unicode": "e978",
"unicode_decimal": 59768
},
{
"icon_id": "41333990",
"name": "veops-rise",
"font_class": "veops-rise",
"unicode": "e979",
"unicode_decimal": 59769
},
{
"icon_id": "41143117",
"name": "caise-数据中心",

BIN
cmdb-ui/public/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
cmdb-ui/public/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
cmdb-ui/public/iconfont/iconfont.woff2
View File

Binary file not shown.

35
cmdb-ui/src/components/tools/UserMenu.vue
View File

@ -5,12 +5,12 @@
<span
v-if="hasBackendPermission"
@click="handleClick"
class="action"
style="width: 40px; display: flex; justify-content: center"
class="common-settings-btn"
>
<a-icon type="setting" />
<ops-icon class="common-settings-btn-icon" type="veops-setting" />
<span class="common-settings-btn-text">{{ $t('settings') }}</span>
</span>
<span class="locale" @click="changeLang">{{ locale === 'zh' ? 'English' : '中文' }}</span>
<span class="locale" @click="changeLang">{{ locale === 'zh' ? '简中' : 'EN' }}</span>
<a-popover
trigger="click"
:overlayStyle="{ width: '150px' }"
@ -123,3 +123,30 @@ export default {
}
}
</style>
<style lang="less" scoped>
.user-wrapper {
.common-settings-btn {
cursor: pointer;
padding: 0px 18px;
background-color: #F0F5FF;
border-radius: 22px;
height: 26px;
display: flex;
align-items: center;
justify-content: center;
&-icon {
font-size: 12px;
color: #2F54EB;
}
&-text {
margin-left: 4px;
font-size: 12px;
font-weight: 400;
color: #4E5969;
}
}
}
</style>

1
cmdb-ui/src/lang/en.js
View File

@ -10,6 +10,7 @@ export default {
resourceType: 'Resource Types',
trigger: 'Triggers',
},
settings: 'Common Settings',
screen: 'Big Screen',
dashboard: 'Dashboard',
admin: 'Admin',

1
cmdb-ui/src/lang/zh.js
View File

@ -10,6 +10,7 @@ export default {
resourceType: '资源类型',
trigger: '触发器',
},
settings: '通用设置',
screen: '大屏',
dashboard: '仪表盘',
admin: '管理员',

2
cmdb-ui/src/modules/cmdb/router/index.js
View File

@ -102,7 +102,7 @@ const genCmdbRoutes = async () => {
name: 'cmdb_ci_type',
component: RouteView,
redirect: '/cmdb/ci_type',
meta: { title: 'cmdb.menu.backendManage', icon: 'setting', permission: ['cmdb_admin', 'OneOPS_Application_Admin', 'admin'], },
meta: { title: 'cmdb.menu.backendManage', icon: 'veops-setting2', permission: ['cmdb_admin', 'OneOPS_Application_Admin', 'admin'], },
children: [
{
path: '/cmdb/customdashboard',

22
cmdb-ui/src/modules/cmdb/views/custom_dashboard/chartForm.vue
View File

@ -362,6 +362,7 @@ export default {
commonAttributes: [],
level2children: {},
isShadow: false,
changeCITypeRequestValue: null,
}
},
computed: {
@ -425,6 +426,14 @@ export default {
this.fontColor = fontColor
this.bgColor = bgColor
}
if (type_ids?.length || type_id) {
const requireTypeIds = type_id ? [type_id] : type_ids
await getCITypeAttributesByTypeIds({ type_ids: requireTypeIds.join(',') }).then((res) => {
this.attributes = res.attributes
})
}
if (type_ids && type_ids.length) {
await getCITypeAttributesByTypeIds({ type_ids: type_ids.join(',') }).then((res) => {
this.attributes = res.attributes
@ -483,19 +492,26 @@ export default {
changeCIType(value) {
this.form.attr_ids = []
this.commonAttributes = []
this.changeCITypeRequestValue = value
if ((Array.isArray(value) && value.length) || (!Array.isArray(value) && value)) {
getCITypeAttributesByTypeIds({ type_ids: Array.isArray(value) ? value.join(',') : value }).then((res) => {
this.attributes = res.attributes
if (this.changeCITypeRequestValue === value) {
this.attributes = res.attributes
}
})
}
if (!Array.isArray(value) && value) {
getRecursive_level2children(value).then((res) => {
this.level2children = res
if (this.changeCITypeRequestValue === value) {
this.level2children = res
}
})
}
if ((['bar', 'line', 'pie'].includes(this.chartType) && this.form.category === 1) || this.chartType === 'table') {
getCITypeCommonAttributesByTypeIds({ type_ids: Array.isArray(value) ? value.join(',') : value }).then((res) => {
this.commonAttributes = res.attributes
if (this.changeCITypeRequestValue === value) {
this.commonAttributes = res.attributes
}
})
}
},