xiangpei
2025-02-20 fc678c5088b084311f7c11cb2793dbe62049ca9e
字典改为树结构
7个文件已修改
684 ■■■■■ 已修改文件
src/api/system/dict/data.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/DictData/index.js 91 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/dict/DictConverter.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/dict/DictData.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/dict/DictMeta.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/dict/DictOptions.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/dict/data.vue 557 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/dict/data.js
@@ -50,3 +50,12 @@
    method: 'delete'
  })
}
// 查询字典数据列表(不分页)
export function dataList(query) {
  return request({
    url: '/system/dict/data/dataList',
    method: 'get',
    params: query
  })
}
src/components/DictData/index.js
@@ -2,48 +2,51 @@
import store from '@/store'
import DataDict from '@/utils/dict'
import { getDicts as getDicts } from '@/api/system/dict/data'
import { handleTree } from '@/utils/ruoyi'
function searchDictByKey(dict, key) {
  if (key == null && key == "") {
    return null
  }
  try {
    for (let i = 0; i < dict.length; i++) {
      if (dict[i].key == key) {
        return dict[i].value
      }
    }
  } catch (e) {
    return null
  }
}
function install() {
  Vue.use(DataDict, {
    metas: {
      '*': {
        labelField: 'dictLabel',
        valueField: 'dictValue',
        request(dictMeta) {
          const storeDict = searchDictByKey(store.getters.dict, dictMeta.type)
          if (storeDict) {
            return new Promise(resolve => { resolve(storeDict) })
          } else {
            return new Promise((resolve, reject) => {
              getDicts(dictMeta.type).then(res => {
                store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
                resolve(res.data)
              }).catch(error => {
                reject(error)
              })
            })
          }
        },
      },
    },
  })
}
export default {
  install,
}
 function searchDictByKey(dict, key) {
   if (key == null && key == '') {
     return null
   }
   try {
     for (let i = 0; i < dict.length; i++) {
       if (dict[i].key == key) {
         return dict[i].value
       }
     }
   } catch (e) {
     return null
   }
 }
 function install() {
   Vue.use(DataDict, {
     metas: {
       '*': {
         labelField: 'dictLabel',
         valueField: 'dictValue',
         childrenField: 'children',
         request(dictMeta) {
           const storeDict = searchDictByKey(store.getters.dict, dictMeta.type)
           if (storeDict) {
             return new Promise(resolve => {
               resolve(storeDict)
             })
           } else {
             return new Promise((resolve, reject) => {
               getDicts(dictMeta.type).then(res => {
                 const dictData = handleTree(res.data, 'dictCode', null, null)
                 store.dispatch('dict/setDict', { key: dictMeta.type, value: dictData })
                 resolve(dictData)
               }).catch(error => {
                 reject(error)
               })
             })
           }
         }
       }
     }
   })
 }
 export default {
   install
 }
src/utils/dict/DictConverter.js
@@ -1,10 +1,20 @@
import DictOptions from './DictOptions'
import DictData from './DictData'
export default function(dict, dictMeta) {
export default function dictConverter(dict, dictMeta) {
  const label = determineDictField(dict, dictMeta.labelField, ...DictOptions.DEFAULT_LABEL_FIELDS)
  const value = determineDictField(dict, dictMeta.valueField, ...DictOptions.DEFAULT_VALUE_FIELDS)
  return new DictData(dict[label], dict[value], dict)
  const children = determineDictField(dict, dictMeta.childrenField, ...DictOptions.DEFAULT_CHILDREN_FIELDS)
  // 递归处理子字典
  const childDicts = dict[children]
  let childDictData = []
  if (childDicts && childDicts.length > 0) {
    childDictData = childDicts.map(childDict => dictConverter(childDict, dictMeta))
  }
  return new DictData(dict[label], dict[value], dict, childDictData)
  // return new DictData(dict[label], dict[value], dict, dict[children])
}
/**
src/utils/dict/DictData.js
@@ -3,11 +3,13 @@
 * @property {String} label 标签
 * @property {*} value 标签
 * @property {Object} raw 原始数据
 * @property {Object} children 子标签
 */
export default class DictData {
  constructor(label, value, raw) {
  constructor(label, value, raw, children) {
    this.label = label
    this.value = value
    this.raw = raw
    this.children = children.length > 0 ? children : undefined
  }
}
src/utils/dict/DictMeta.js
@@ -6,6 +6,7 @@
 * @property {String} type 类型
 * @property {Function} request 请求
 * @property {String} label 标签字段
 * @property {Object} children 子标签字段
 * @property {String} value 值字段
 */
export default class DictMeta {
@@ -15,6 +16,7 @@
    this.responseConverter = options.responseConverter
    this.labelField = options.labelField
    this.valueField = options.valueField
    this.childrenField = options.childrenField // 添加children变量
    this.lazy = options.lazy === true
  }
}
src/utils/dict/DictOptions.js
@@ -17,7 +17,8 @@
      responseConverter,
      labelField: 'label',
      valueField: 'value',
    },
      childrenField: 'children'
    }
  },
  /**
   * 默认标签字段
@@ -27,6 +28,10 @@
   * 默认值字段
   */
  DEFAULT_VALUE_FIELDS: ['value', 'id', 'uid', 'key'],
  /**
   * 默认值字段
   */
  DEFAULT_CHILDREN_FIELDS: ['children', 'childr', 'child']
}
/**
src/views/system/dict/data.vue
@@ -34,7 +34,6 @@
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
@@ -44,29 +43,18 @@
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:dict:add']"
        >新增</el-button>
        >新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          type="info"
          plain
          icon="el-icon-edit"
          icon="el-icon-sort"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:dict:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:dict:remove']"
        >删除</el-button>
          @click="toggleExpandAll"
        >展开/折叠
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
@@ -76,7 +64,8 @@
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
        >导出
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
@@ -85,34 +74,46 @@
          icon="el-icon-close"
          size="mini"
          @click="handleClose"
        >关闭</el-button>
        >关闭
        </el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="字典编码" align="center" prop="dictCode" />
      <el-table-column label="字典标签" align="center" prop="dictLabel">
    <el-table
      v-if="refreshTable"
      v-loading="loading"
      :data="dataList"
      row-key="dictCode"
      :default-expand-all="isExpandAll"
      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
    >
      <el-table-column label="字典标签" width="200" prop="dictLabel">
        <template slot-scope="scope">
          <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
           <span
             v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)"
           >{{ scope.row.dictLabel }}</span>
          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass"
                  :class="scope.row.cssClass"
          >{{ scope.row.dictLabel }}
          </el-tag>
        </template>
      </el-table-column>
      <el-table-column label="字典键值" align="center" prop="dictValue" />
      <el-table-column label="字典排序" align="center" prop="dictSort" />
      <el-table-column label="字典编码" align="center" prop="dictCode"/>
      <el-table-column label="字典键值" align="center" prop="dictValue"/>
      <el-table-column label="字典排序" align="center" prop="dictSort"/>
      <el-table-column label="状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
@@ -120,43 +121,54 @@
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:dict:edit']"
          >修改</el-button>
          >修改
          </el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-plus"
            @click="handleAdd(scope.row)"
            v-hasPermi="['system:dict:add']"
          >新增
          </el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:dict:remove']"
          >删除</el-button>
          >删除
          </el-button>
        </template>
      </el-table-column>
    </el-table>
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <!-- 添加或修改参数配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="字典类型">
          <el-input v-model="form.dictType" :disabled="true" />
          <el-input v-model="form.dictType" :disabled="true"/>
        </el-form-item>
        <el-form-item label="上级字典" prop="parentId">
          <treeselect
            v-model="form.parentId"
            :options="dictOptions"
            :normalizer="normalizer"
            :show-count="true"
            placeholder="选择上级字典"
          />
        </el-form-item>
        <el-form-item label="数据标签" prop="dictLabel">
          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
          <el-input v-model="form.dictLabel" placeholder="请输入数据标签"/>
        </el-form-item>
        <el-form-item label="数据键值" prop="dictValue">
          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
          <el-input v-model="form.dictValue" placeholder="请输入数据键值"/>
        </el-form-item>
        <el-form-item label="样式属性" prop="cssClass">
          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
          <el-input v-model="form.cssClass" placeholder="请输入样式属性"/>
        </el-form-item>
        <el-form-item label="显示排序" prop="dictSort">
          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
          <el-input-number v-model="form.dictSort" controls-position="right" :min="0"/>
        </el-form-item>
        <el-form-item label="回显样式" prop="listClass">
          <el-select v-model="form.listClass">
@@ -174,7 +186,8 @@
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
            >{{ dict.label }}
            </el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
@@ -190,213 +203,245 @@
</template>
<script>
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
import { dataList, getData, delData, addData, updateData } from '@/api/system/dict/data'
import { optionselect as getDictOptionselect, getType } from '@/api/system/dict/type'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from '@riophae/vue-treeselect'
export default {
  name: "Data",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 字典表格数据
      dataList: [],
      // 默认字典类型
      defaultDictType: "",
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 数据标签回显样式
      listClassOptions: [
        {
          value: "default",
          label: "默认"
        },
        {
          value: "primary",
          label: "主要"
        },
        {
          value: "success",
          label: "成功"
        },
        {
          value: "info",
          label: "信息"
        },
        {
          value: "warning",
          label: "警告"
        },
        {
          value: "danger",
          label: "危险"
        }
      ],
      // 类型数据字典
      typeOptions: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        dictType: undefined,
        dictLabel: undefined,
        status: undefined
      },
      // 表单参数
      form: {},
      // 表单校验
      rules: {
        dictLabel: [
          { required: true, message: "数据标签不能为空", trigger: "blur" }
        ],
        dictValue: [
          { required: true, message: "数据键值不能为空", trigger: "blur" }
        ],
        dictSort: [
          { required: true, message: "数据顺序不能为空", trigger: "blur" }
        ]
      }
    };
  },
  created() {
    const dictId = this.$route.params && this.$route.params.dictId;
    this.getType(dictId);
    this.getTypeList();
  },
  methods: {
    /** 查询字典类型详细 */
    getType(dictId) {
      getType(dictId).then(response => {
        this.queryParams.dictType = response.data.dictType;
        this.defaultDictType = response.data.dictType;
        this.getList();
      });
    },
    /** 查询字典类型列表 */
    getTypeList() {
      getDictOptionselect().then(response => {
        this.typeOptions = response.data;
      });
    },
    /** 查询字典数据列表 */
    getList() {
      this.loading = true;
      listData(this.queryParams).then(response => {
        this.dataList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
        dictCode: undefined,
        dictLabel: undefined,
        dictValue: undefined,
        cssClass: undefined,
        listClass: 'default',
        dictSort: 0,
        status: "0",
        remark: undefined
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 返回按钮操作 */
    handleClose() {
      const obj = { path: "/system/dict" };
      this.$tab.closeOpenPage(obj);
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.queryParams.dictType = this.defaultDictType;
      this.handleQuery();
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加字典数据";
      this.form.dictType = this.queryParams.dictType;
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.dictCode)
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
      const dictCode = row.dictCode || this.ids
      getData(dictCode).then(response => {
        this.form = response.data;
        this.open = true;
        this.title = "修改字典数据";
      });
    },
    /** 提交按钮 */
    submitForm: function() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.dictCode != undefined) {
            updateData(this.form).then(response => {
              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addData(this.form).then(response => {
              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const dictCodes = row.dictCode || this.ids;
      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?').then(function() {
        return delData(dictCodes);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
        this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('system/dict/data/export', {
        ...this.queryParams
      }, `data_${new Date().getTime()}.xlsx`)
    }
  }
};
</script>
 export default {
   name: 'Data',
   dicts: ['sys_normal_disable'],
   components: { Treeselect },
   data() {
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
       // 非单个禁用
       single: true,
       // 显示搜索条件
       showSearch: true,
       // 字典表格数据
       dataList: [],
       // 字典树选项
       dictOptions: [],
       // 默认字典类型
       defaultDictType: '',
       // 弹出层标题
       title: '',
       // 是否显示弹出层
       open: false,
       // 是否展开,默认全部折叠
       isExpandAll: false,
       // 重新渲染表格状态
       refreshTable: true,
       // 数据标签回显样式
       listClassOptions: [
         {
           value: 'default',
           label: '默认'
         },
         {
           value: 'primary',
           label: '主要'
         },
         {
           value: 'success',
           label: '成功'
         },
         {
           value: 'info',
           label: '信息'
         },
         {
           value: 'warning',
           label: '警告'
         },
         {
           value: 'danger',
           label: '危险'
         }
       ],
       // 类型数据字典
       typeOptions: [],
       // 查询参数
       queryParams: {
         dictType: undefined,
         dictLabel: undefined,
         status: undefined
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         dictLabel: [
           { required: true, message: '数据标签不能为空', trigger: 'blur' }
         ],
         dictValue: [
           { required: true, message: '数据键值不能为空', trigger: 'blur' }
         ],
         dictSort: [
           { required: true, message: '数据顺序不能为空', trigger: 'blur' }
         ]
       }
     }
   },
   created() {
     const dictId = this.$route.params && this.$route.params.dictId
     this.getType(dictId)
     this.getTypeList()
   },
   methods: {
     /** 查询字典类型详细 */
     getType(dictId) {
       getType(dictId).then(response => {
         this.queryParams.dictType = response.data.dictType
         this.defaultDictType = response.data.dictType
         this.getList()
       })
     },
     /** 查询字典类型列表 */
     getTypeList() {
       getDictOptionselect().then(response => {
         this.typeOptions = response.data
       })
     },
     /** 查询字典数据列表 */
     getList() {
       this.loading = true
       dataList(this.queryParams).then(response => {
         this.dataList = this.handleTree(response.data, 'dictCode')
         this.loading = false
       })
     },
     /** 转换字典数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
         delete node.children
       }
       return {
         id: node.dictCode,
         label: node.dictLabel,
         children: node.children
       }
     },
     /** 查询菜单下拉树结构 */
     getTreeselect() {
       dataList(this.queryParams).then(response => {
         this.dictOptions = []
         const dict = { dictCode: 0, dictLabel: '主类目', children: [] }
         dict.children = this.handleTree(response.data, 'dictCode')
         this.dictOptions.push(dict)
       })
     },
     // 取消按钮
     cancel() {
       this.open = false
       this.reset()
     },
     // 表单重置
     reset() {
       this.form = {
         dictCode: undefined,
         parentId: undefined,
         dictLabel: undefined,
         dictValue: undefined,
         cssClass: undefined,
         listClass: 'default',
         dictSort: 0,
         status: '0',
         remark: undefined
       }
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
       this.getList()
     },
     /** 返回按钮操作 */
     handleClose() {
       const obj = { path: '/system/dict' }
       this.$tab.closeOpenPage(obj)
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
       this.queryParams.dictType = this.defaultDictType
       this.handleQuery()
     },
     /** 新增按钮操作 */
     handleAdd(row) {
       this.reset()
       this.getTreeselect()
       if (row != undefined && row.dictCode) {
         this.form.parentId = row.dictCode
       } else {
         this.form.parentId = 0
       }
       this.open = true
       this.title = '添加字典数据'
       this.form.dictType = this.queryParams.dictType
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
       this.refreshTable = false
       this.isExpandAll = !this.isExpandAll
       this.$nextTick(() => {
         this.refreshTable = true
       })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
       this.getTreeselect()
       getData(row.dictCode).then(response => {
         this.form = response.data
         this.open = true
         this.title = '修改字典数据'
       })
     },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.dictCode != undefined) {
             updateData(this.form).then(response => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
               this.$modal.msgSuccess('修改成功')
               this.open = false
               this.getList()
             })
           } else {
             addData(this.form).then(response => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
               this.$modal.msgSuccess('新增成功')
               this.open = false
               this.getList()
             })
           }
         }
       })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictCodes = row.dictCode || this.ids
       this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?').then(function() {
         return delData(dictCodes)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess('删除成功')
         this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
       }).catch(() => {
       })
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/dict/data/export', {
         ...this.queryParams
       }, `data_${new Date().getTime()}.xlsx`)
     }
   }
 }
</script>