diff --git a/src/assets/image/common/iconTreeFolder.png b/src/assets/image/common/iconTreeFolder.png new file mode 100644 index 00000000..877fb645 Binary files /dev/null and b/src/assets/image/common/iconTreeFolder.png differ diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 66d2ac41..3ef5121c 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -444,3 +444,69 @@ box-sizing: border-box; } } + +/*树节点样式*/ +.ant-tree li .ant-tree-node-content-wrapper { + width: calc(100% - 24px); + box-sizing: border-box; +} + +/*展开收起按钮颜色*/ +.ant-tree.ant-tree-show-line li span.ant-tree-switcher { + color: #86909c; +} + +//子节点前面文件图标的颜色 +.ant-tree li span.ant-tree-switcher.ant-tree-switcher-noop { + color: #1D2129; +} + +.ant-tree-title { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 100%; + height: 100%; + display: inline-block; +} + +// 文件夹节点使用自定义 +.tree-node { + display: flex; + align-items: center; + width: 100%; + + &-icon { + width: 16px; + margin-right: 4px; + } + + &-title { + flex: 1; + width: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } +} + +.tree-node-custom-title { + display: inline-block; + width: 100%; + height: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + flex: 1; +} + +// 鼠标移入树节点样式修改 +.ant-tree li .ant-tree-node-content-wrapper:hover { + background: #FFFFFF; + box-shadow: 0 0 4px 0 rgba(0,0,0,0.1); + border-radius: 4px 4px 4px 4px; + opacity: 1; + margin-left: -24px; + padding-left: 29px; + width: 100%; +} \ No newline at end of file diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 9f6c7208..6e95cde9 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -1,5 +1,6 @@ const system = require('./system/en.js') const personalCenter = require('./personalCenter/en.js') +const standardRegulationLibrary = require('./standardRegulationLibrary/en-us') module.exports = { // 共用 @@ -486,5 +487,7 @@ module.exports = { // 系统管理 system, // 个人中心 - personalCenter + personalCenter, + // 标准法规库 + standardRegulationLibrary } diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js new file mode 100644 index 00000000..aaf2a591 --- /dev/null +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -0,0 +1,6 @@ +module.exports = { + // 国内标准 + domesticStandard: { + treeSearchPlaceholder: 'Please enter the tree system' // 请输入树状图体系 + } +} diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js new file mode 100644 index 00000000..a384e793 --- /dev/null +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -0,0 +1,6 @@ +module.exports = { + // 国内标准 + domesticStandard: { + treeSearchPlaceholder: '请输入树状图体系' + } +} diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 110836d1..a533a62d 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -1,5 +1,6 @@ const system = require('./system/zh.js') const personalCenter = require('./personalCenter/zh.js') +const standardRegulationLibrary = require('./standardRegulationLibrary/zh-cn') module.exports = { // 共用 @@ -496,5 +497,7 @@ module.exports = { // 系统管理 system, // 个人中心 - personalCenter + personalCenter, + // 标准法规库 + standardRegulationLibrary } diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index f7eb3bcf..66f2ec80 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -134,7 +134,6 @@ export const ConfigurableTableMixin = { item.width = 215 item.title = item.dbFieldTxt item.dataIndex = item.dbFieldName - item.align = 'left' tempColumns.push(item) }) if (this.showAction && this.operateColumn) { diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue index 8adb5184..0b04d797 100644 --- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue +++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue @@ -1,13 +1,155 @@ -