diff --git a/src/assets/css/components/views/setting/entitySettingForm.scss b/src/assets/css/components/views/setting/entitySettingForm.scss index 73f4e676..6f4ea759 100644 --- a/src/assets/css/components/views/setting/entitySettingForm.scss +++ b/src/assets/css/components/views/setting/entitySettingForm.scss @@ -123,6 +123,7 @@ $border-color-light: var(--el-border-color-light); width: 596px; line-height: 12px; display: flex; + flex-direction: column; font-size: 12px; color: var(--el-text-color-primary); font-weight: bold; @@ -131,6 +132,15 @@ $border-color-light: var(--el-border-color-light); div:nth-child(1) { width: 288px; } + + .block-header__menu { + display: flex; + padding: 10px; + + div:nth-child(1) { + width: 278px; + } + } } .el-form { @@ -138,8 +148,8 @@ $border-color-light: var(--el-border-color-light); flex-direction: column; } - .block-body { - width: 596px; + .block-body, .block-body1 { + width: 576px; display: flex; .el-form-item { @@ -147,11 +157,12 @@ $border-color-light: var(--el-border-color-light); } .block-body__select { - width: 260px; + width: 255px; } .block-body-equal { margin: 0 10px; + color: var(--el-text-color-disabled); } .mapping-item-add { @@ -187,10 +198,18 @@ $border-color-light: var(--el-border-color-light); } .relation-type__select { - width: 312px; + width: 302px; margin: 0 10px; } } + + .block-body { + padding-left: 10px; + } + + .block-body1 { + width: 596px; + } } .form-setting-type { diff --git a/src/assets/css/font/iconfont.css b/src/assets/css/font/iconfont.css index 02c32675..482704cd 100644 --- a/src/assets/css/font/iconfont.css +++ b/src/assets/css/font/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "cn-icon"; /* Project id 2614877 */ - src: url('iconfont.woff2?t=1730282688072') format('woff2'), - url('iconfont.woff?t=1730282688072') format('woff'), - url('iconfont.ttf?t=1730282688072') format('truetype'); + src: url('iconfont.woff2?t=1731894091336') format('woff2'), + url('iconfont.woff?t=1731894091336') format('woff'), + url('iconfont.ttf?t=1731894091336') format('truetype'); } .cn-icon { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.cn-icon-System:before { + content: "\e830"; +} + +.cn-icon-mutual:before { + content: "\ec8d"; +} + .cn-icon-breached-human-black:before { content: "\e824"; } diff --git a/src/assets/css/font/iconfont.js b/src/assets/css/font/iconfont.js index 4c5b8177..d7097998 100644 --- a/src/assets/css/font/iconfont.js +++ b/src/assets/css/font/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2614877='',(l=>{var a=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var h,o,i,m,z,v=function(a,c){c.parentNode.insertBefore(a,c)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_2614877,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?v(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),h()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=h,m=l.document,z=!1,s(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,t())})}function t(){z||(z=!0,i())}function s(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}t()}})(window); \ No newline at end of file +window._iconfont_svg_string_2614877='',(l=>{var a=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var h,o,i,m,z,v=function(a,c){c.parentNode.insertBefore(a,c)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_2614877,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?v(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),h()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=h,m=l.document,z=!1,s(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,t())})}function t(){z||(z=!0,i())}function s(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}t()}})(window); \ No newline at end of file diff --git a/src/assets/css/font/iconfont.ttf b/src/assets/css/font/iconfont.ttf index 2f118a06..34bb6b83 100644 Binary files a/src/assets/css/font/iconfont.ttf and b/src/assets/css/font/iconfont.ttf differ diff --git a/src/assets/css/font/iconfont.woff b/src/assets/css/font/iconfont.woff index d6733430..81920efc 100644 Binary files a/src/assets/css/font/iconfont.woff and b/src/assets/css/font/iconfont.woff differ diff --git a/src/assets/css/font/iconfont.woff2 b/src/assets/css/font/iconfont.woff2 index c3db6e86..4031d38e 100644 Binary files a/src/assets/css/font/iconfont.woff2 and b/src/assets/css/font/iconfont.woff2 differ diff --git a/src/components/table/setting/ProfilesTable.vue b/src/components/table/setting/ProfilesTable.vue index 3f97131b..6376197d 100644 --- a/src/components/table/setting/ProfilesTable.vue +++ b/src/components/table/setting/ProfilesTable.vue @@ -33,13 +33,18 @@
- + {{ dateFormatByAppearance(scope.row[item.prop]) || '-' }} - - {{ scope.row[item.prop] || '-' }} + + {{ scope.row[item.prop].name || '-' }} + + + {{ handleListTypes(scope.row[item.prop]) }} + @@ -75,32 +80,32 @@ export default { }, { label: this.$t('setting.source'), - prop: 'source', + prop: 'entitySource', show: true, sortable: 'custom', minWidth: 200 }, { label: this.$t('setting.entityTypes'), - prop: 'entityTypes', + prop: 'entities', show: true, minWidth: 200 }, { label: this.$t('setting.relationTypes'), - prop: 'relationTypes', + prop: 'relations', show: true, minWidth: 200 }, { label: this.$t('config.user.createTime'), - prop: 'ctime', + prop: 'create_time', show: true, minWidth: 200 }, { label: this.$t('overall.updateTime'), - prop: 'utime', + prop: 'update_time', show: true } ] @@ -111,6 +116,21 @@ export default { // 禁止勾选buildIn为1的项,即禁止修改、删除admin的账号 checkSelectable (row) { return row.buildIn !== 1 + }, + handleListTypes (data) { + let str = '' + if (data && typeof data === 'string') { + data = JSON.parse(data) + data.forEach(item => { + if (!str) { + str = item.type + ',' + } else if (str.indexOf(item.type) < 0) { + str += item.type + ',' + } + }) + str = str.slice(0, -1) + } + return str } } } diff --git a/src/components/table/setting/SourcesTable.vue b/src/components/table/setting/SourcesTable.vue index c002829c..e8c3ee57 100644 --- a/src/components/table/setting/SourcesTable.vue +++ b/src/components/table/setting/SourcesTable.vue @@ -33,14 +33,14 @@ - + {{ dateFormatByAppearance(scope.row[item.prop]) || '-' }} - - + {{ scope.row[item.prop] || '-' }} @@ -58,7 +58,7 @@