+
-
+
@@ -45,8 +51,6 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@change="handleTableChange"
>
-
-
{{ text || text === 0 ? text : global.emptyLine }}
@@ -65,7 +69,9 @@
-
+
+
+
@@ -74,14 +80,18 @@ import '@assets/less/common.less'
import { TagListMixin } from './TagListMixin'
import { ResizeColumnProvide, ResizeHeader } from '../../../../mixins/header'
import TagContentModal from '../modules/TagContentModal'
+import TagContentDictListDrawer from '../modules/TagContentDictListDrawer'
+import JDictSelectTag from '../../../../components/dict/JDictSelectTag'
export default {
name: 'TagContent',
mixins: [TagListMixin, ResizeHeader, ResizeColumnProvide],
components: {
- TagContentModal
+ TagContentModal,
+ TagContentDictListDrawer,
+ JDictSelectTag
},
- data() {
+ data () {
return {
columns: [
{
@@ -123,7 +133,7 @@ export default {
width: 170
}
],
- // dataSource: [],
+ dataSource: [{}],
url: {
list: ''
}
@@ -131,8 +141,8 @@ export default {
},
methods: {
// 编辑字典数据
- editDictItem(record) {
- this.$refs.dictItemList.edit(record)
+ editDictItem (record) {
+ this.$refs.tagContentDictListDrawer.show(record)
}
}
}
diff --git a/src/views/system/tags/pages/TagItem.vue b/src/views/system/tags/pages/TagItem.vue
index 1eaf7767..60b32e87 100644
--- a/src/views/system/tags/pages/TagItem.vue
+++ b/src/views/system/tags/pages/TagItem.vue
@@ -3,7 +3,7 @@
-
+
@@ -13,27 +13,22 @@