Просмотр исходного кода

Merge remote-tracking branch 'origin/dev' into dev

chenping 11 месяцев назад
Родитель
Сommit
3eb4a6ca5c
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      src/views/system/dictionary/index.vue

+ 6 - 3
src/views/system/dictionary/index.vue

@@ -9,7 +9,6 @@
           icon="el-icon-plus"
           icon="el-icon-plus"
           class="ele-btn-icon"
           class="ele-btn-icon"
           v-if="$hasPermission('main:dictionary:save')"
           v-if="$hasPermission('main:dictionary:save')"
-
           @click="openEdit()"
           @click="openEdit()"
         >
         >
           添加
           添加
@@ -32,7 +31,6 @@
           :disabled="!current"
           :disabled="!current"
           @click="remove"
           @click="remove"
           v-if="$hasPermission('main:dictionary:delete')"
           v-if="$hasPermission('main:dictionary:delete')"
-
         >
         >
           删除
           删除
         </el-button>
         </el-button>
@@ -49,12 +47,13 @@
           :datasource="datasource"
           :datasource="datasource"
           height="calc(100vh - 350px)"
           height="calc(100vh - 350px)"
           :need-page="false"
           :need-page="false"
-          :toolkit="[]"
           :current.sync="current"
           :current.sync="current"
           highlight-current-row
           highlight-current-row
           class="dict-table"
           class="dict-table"
           tool-class="ele-toolbar-actions"
           tool-class="ele-toolbar-actions"
           @done="done"
           @done="done"
+          @columns-change="handleColumnChange"
+          :cache-key="cacheKeyUrl"
         >
         >
           <!-- 表头工具栏 -->
           <!-- 表头工具栏 -->
           <template v-slot:toolbar> </template>
           <template v-slot:toolbar> </template>
@@ -76,12 +75,16 @@
   import DictEdit from './components/dict-edit.vue';
   import DictEdit from './components/dict-edit.vue';
   import DictDataSearch from './components/dict-data-search.vue';
   import DictDataSearch from './components/dict-data-search.vue';
   import { listDictionaries, removeDictionary } from '@/api/system/dictionary';
   import { listDictionaries, removeDictionary } from '@/api/system/dictionary';
+  import tabMixins from '@/mixins/tableColumnsMixin';
 
 
   export default {
   export default {
     name: 'SystemDictionary',
     name: 'SystemDictionary',
     components: { DictData, DictEdit, DictDataSearch },
     components: { DictData, DictEdit, DictDataSearch },
+    mixins: [tabMixins],
+
     data() {
     data() {
       return {
       return {
+        cacheKeyUrl: 'main-ad4181af-syste-dictionary',
         // 表格列配置
         // 表格列配置
         columns: [
         columns: [
           {
           {