分类管理

src/api/modules/manage/type.ts

@@ -7,9 +7,46 @@ export const sysLabelGetAllSysLabels = () => handle({
   url: `/${suffix}/sys/label/getAllSysLabels`,
   method: 'get',
 })
-// 查询所有分类
+// 新增标签
 export const sysLabelSave = (params: any) => handle({
   url: `/${suffix}/sys/label/save`,
   method: 'post',
   params
 })
+// 编辑标签
+export const sysLabelUpdate = (params: any) => handle({
+  url: `/${suffix}/sys/label/update`,
+  method: 'post',
+  params
+})
+// 删除标签
+export const sysLabelDelete = (id: any) => handle({
+  url: `/${suffix}/sys/label/delete/${id}`,
+  method: 'get',
+})
+// 查询详情
+export const sysLabelDetail = (id: any) => handle({
+  url: `/${suffix}/sys/label/detail/${id}`,
+  method: 'get',
+})
+// 查询所有索引
+export const sysLabelGetAllIndexsByKey = () => handle({
+  url: `/${suffix}/sys/label/getAllIndexsByKey`,
+  method: 'get',
+})
+// 查询所有标签关联索引
+export const sysLabelGetAllSysLabelTypes = (id: any) => handle({
+  url: `/${suffix}/sys/label/getAllSysLabelTypes/${id}`,
+  method: 'get',
+})
+// 新增索引到指定分类下
+export const sysLabelAddIndexToLabel = (params: any) => handle({
+  url: `/${suffix}/sys/label/addIndexToLabel`,
+  method: 'get',
+  params
+})
+// 新增索引到指定分类下
+export const sysLabelDeleteLink = (id: any) => handle({
+  url: `/${suffix}/sys/label/deleteLink/${id}`,
+  method: 'get',
+})

src/components/cus/CusDialog.vue

@@ -24,7 +24,7 @@
           <slot name="head"/>
         </div>
         <div class="__cdh-close __hover" @click="CDClose()">
-          <SvgIcon name="close_1" size="14" color="#ffffff"/>
+          <SvgIcon name="close_3" size="16" color="#ffffff"/>
         </div>
       </div>
     </template>

src/components/cus/cus-form-link/radio.vue

@@ -84,4 +84,13 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+:deep(.el-radio.is-checked) {
+  .el-radio__inner {
+    background-color: var(--cus-main-color) !important;
+    border-color: var(--cus-main-color) !important;
+    &:after {
+      background-color: #ffffff !important;
+    }
+  }
+}
 </style>

src/plugins/repeatFileValid.ts

@@ -9,25 +9,29 @@ const SvgValid = () => {
     num1++
     // @ts-ignore
     value().then(res => {
-      const regex = /[^/]+(?=\.[^/.]+)(?![^?=&]+=)/
-      for (const [svgKey, svgValue] of Object.entries(res)) {
-        // @ts-ignore
-        const result: any = svgValue.match(regex);
-        const text = result[0]; // 获取匹配到的文本
-        if (svgRepeatMap.has(text)) {
-          svgRepeatMap.set(text, [...svgRepeatMap.get(text), key])
-        } else {
-          svgRepeatMap.set(text, [key])
-        }
-      }
-      Object.assign(svgModule, res)
-      num2++
-      if (num1 === num2) {
-        svgRepeatMap.forEach((v, k) => {
-          if (v.length > 1) {
-            console.error(`检测到svg图标${k}重复定义，路径为：`, v)
+      try {
+        const regex = /[^/]+(?=\.[^/.]+)(?![^?=&]+=)/
+        for (const [svgKey, svgValue] of Object.entries(res)) {
+          // @ts-ignore
+          const result: any = svgValue.match(regex);
+          const text = result?.[0]; // 获取匹配到的文本
+          if (svgRepeatMap.has(text)) {
+            svgRepeatMap.set(text, [...svgRepeatMap.get(text), key])
+          } else {
+            svgRepeatMap.set(text, [key])
           }
-        })
+        }
+        Object.assign(svgModule, res)
+        num2++
+        if (num1 === num2) {
+          svgRepeatMap.forEach((v, k) => {
+            if (v.length > 1) {
+              console.error(`检测到svg图标${k}重复定义，路径为：`, v)
+            }
+          })
+        }
+      } catch (e) {
+
       }
     })
   }

src/stores/dictionary-define.ts

@@ -1,6 +1,7 @@
 export const dictionaryDefine = {
 	//接口参数 : [ '字典数据list名', '字典数据Map名', '字段数据ObjMap名' ],
 	label_type: ['labelTypeList', 'labelTypeMap'], //  标签类型
+	label_level: ['labelLevelList', 'labelLevelMap'], //  标签层级
 }
 
 const stateMap = {}

src/stores/dictionary.ts

@@ -32,22 +32,21 @@ export const useDictionaryStore = defineStore('dictionary', {
 		initDict(type) {
 			return new Promise((resolve, reject) => {
 				if (this[dictionaryDefine[type][0]].length === 0) {
-					api.default.dictGetAllSysDictsByValue(type).then((res: any) => {
-						console.log(res)
-						// const data = res.data
-						// const map = new Map()
-						// const objMap = new Map()
-						// if (data.length > 0) {
-						// 	data.forEach((v: any) => {
-						// 		v.selectLabel = v.dictLabel
-						// 		v.selectValue = v.dictValue
-						// 		map.set(v.dictValue, v.dictLabel)
-						// 		objMap.set(v.dictValue, v)
-						// 	})
-						// }
-						// this[dictionaryDefine[type][0]] = data
-						// this[dictionaryDefine[type][1]] = map
-						// this[dictionaryDefine[type]?.[2]] = objMap
+					api.default.dictGetAllSysDictsByValue(`dictValue=${type}`).then((res: any) => {
+						const data = res.data
+						const map = new Map()
+						const objMap = new Map()
+						if (data.length > 0) {
+							data.forEach((v: any) => {
+								v.selectLabel = v.dictLabel
+								v.selectValue = v.dictValue
+								map.set(v.dictValue, v.dictLabel)
+								objMap.set(v.dictValue, v)
+							})
+						}
+						this[dictionaryDefine[type][0]] = data
+						this[dictionaryDefine[type][1]] = map
+						this[dictionaryDefine[type]?.[2]] = objMap
 						resolve(res.data)
 					}).catch((e: any) => {
 						console.log('e: ', e);

src/style/cus.scss

@@ -260,6 +260,20 @@
   padding: 20px;
 }
 
+.el-button {
+  &:hover {
+    opacity: 0.75;
+    background-color: #ffffff !important;
+    border-color: var(--cus-main-color) !important;
+  }
+  &.el-button--primary {
+    &:hover {
+      background-color: var(--cus-main-color) !important;
+      border-color: var(--cus-main-color) !important;
+    }
+  }
+}
+
 em {
   color: red;
 }

src/views/manage/type/detail.vue

@@ -6,6 +6,7 @@
     width="1000px"
     height="auto"
     @onSubmit="onSubmit"
+    :loading="state.loading"
   >
     <div class="__cus-dialog-form">
       <CusForm ref="ref_form">
@@ -13,7 +14,7 @@
           :span="24"
           required
           label="类型"
-          v-model:param="state.form.labelParentId"
+          v-model:param="state.form.labelType"
           link="radio"
           :options="DictionaryStore.labelTypeList"
           :disabled="true"
@@ -35,9 +36,12 @@
         />
         <CusFormColumn
           :span="8"
+          required
           label="排序"
           v-model:param="state.form.labelOrder"
           link="input-number"
+          :min="0"
+          :max="999"
         />
         <CusFormColumn
           :span="24"
@@ -55,8 +59,8 @@
 import {computed, getCurrentInstance, nextTick, reactive, ref, watch} from "vue";
 import {useDictionaryStore} from "@/stores";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {sysLabelSave} from "@/api/modules/manage/type";
 
+const emit = defineEmits(['update:show'])
 const {proxy} = getCurrentInstance()
 const DictionaryStore = useDictionaryStore()
 const props = defineProps({
@@ -64,7 +68,8 @@ const props = defineProps({
   transfer: {}
  })
 const state: any = reactive({
-  form: {}
+  form: {},
+  loading: false
 })
 const ref_form = ref()
 const titleCpt = computed(() => {
@@ -85,9 +90,32 @@ const onSubmit = () => {
       type: "warning",
     } as any).then(() => {
       state.loading = true
-      proxy.$api.sysLabelSave(state.form).then(res => {
-
-      })
+      switch (props.transfer.mode) {
+        case 'add': {
+          proxy.$api.sysLabelSave(state.form).then(res => {
+            if (res.code === 200) {
+              ElMessage.success('新增成功！')
+              emit('update:show', false)
+              emit('refresh')
+            } else {
+              ElMessage.error(res.msg)
+            }
+            state.loading = false
+          })
+        } break
+        case 'edit': {
+          proxy.$api.sysLabelUpdate(state.form).then(res => {
+            if (res.code === 200) {
+              ElMessage.success('编辑成功！')
+              emit('update:show', false)
+              emit('refresh')
+            } else {
+              ElMessage.error(res.msg)
+            }
+            state.loading = false
+          })
+        } break
+      }
     }).catch(() => {})
   }).catch((e) => {
     ElMessage({
@@ -97,19 +125,39 @@ const onSubmit = () => {
     })
   })
 }
+const initDetail = () => {
+  state.loading = true
+  proxy.$api.sysLabelDetail(props.transfer.id).then(res => {
+    if (res.code === 200) {
+      state.form = res.data
+      state.loading = false
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
 watch(() => props.show, (n) => {
   if (n) {
+    initDictionary()
     if (props.transfer.mode === 'add') {
       state.form = {
-        labelParentId: props.transfer.pId,
-        labelLevel: 3
+        labelParentId: props.transfer.labelParentId,
+        labelType: props.transfer.labelType,
+        labelLevel: 3,
+        labelOrder: 999
       }
+    } else {
+      initDetail()
     }
     nextTick(() => {
       ref_form.value.reset()
     })
   }
 })
+const initDictionary = () => {
+  DictionaryStore.initDict('label_type')
+  DictionaryStore.initDict('label_level')
+}
 </script>
 
 <style lang="scss" scoped>

src/views/manage/type/index.vue

@@ -8,26 +8,32 @@
         :no-page="true"
         default-expand-all
       >
+        <template #labelType-column-value="{scope}">
+          {{DictionaryStore.labelTypeMap.get(scope.row.labelType)}}
+        </template>
         <template #do-column-value="{scope}">
           <template v-if="scope.row.labelLevel == 2">
             <CusButton type="table-add" title="新增下级" @click="onAdd(scope.row)"/>
           </template>
           <template v-else>
-            <CusButton type="table" icon="relation" title="关联"/>
-            <CusButton type="table-edit"/>
-            <CusButton type="table-del"/>
+            <CusButton type="table" icon="relation" title="关联" @click="onRelation(scope.row)"/>
+            <CusButton type="table-edit" @click="onEdit(scope.row)"/>
+            <CusButton type="table-del" @click="onDel(scope.row)"/>
           </template>
         </template>
       </CusTable>
     </div>
-    <DetailCom v-model:show="state.detail.show" :transfer="state.detail.transfer"/>
+    <DetailCom v-model:show="state.detail.show" :transfer="state.detail.transfer" @refresh="initTree"/>
+    <RelationCom v-model:show="state.relation.show" :transfer="state.relation.transfer" @refresh="initTree"/>
   </div>
 </template>
 
 <script setup lang="ts">
 import {getCurrentInstance, onMounted, reactive} from "vue";
 import DetailCom from './detail.vue'
+import RelationCom from './relation.vue'
 import {useDictionaryStore} from "@/stores";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const {proxy} = getCurrentInstance()
 const DictionaryStore = useDictionaryStore()
@@ -36,11 +42,11 @@ const state: any = reactive({
     loading: false,
     tableHead: [
       {value: "labelName", label: "名称", align: 'left', headerAlign: 'left', minWidth: 400},
-      {value: "labelTypeName", label: "类型", width: 120},
+      {value: "labelType", label: "类型", width: 120},
       {value: "labelOrder", label: "排序", width: 120},
       {value: "indexNum", label: "索引数量", width: 120},
-      {value: "createTime", label: "创建时间", width: 180},
-      {value: "updateTime", label: "最后修改时间", width: 180},
+      {value: "createTime", label: "创建时间", width: 200},
+      {value: "updateTime", label: "最后修改时间", width: 200},
       {value: "remark", label: "备注", width: 200},
       {value: "do", label: "操作", width: 220, fixed: 'right'},
     ],
@@ -51,6 +57,10 @@ const state: any = reactive({
   detail: {
     show: false,
     transfer: {}
+  },
+  relation: {
+    show: false,
+    transfer: {}
   }
 })
 const initTree = () => {
@@ -63,13 +73,43 @@ const initTree = () => {
   })
 }
 const onAdd = (row) => {
-  console.log(row)
   state.detail.transfer = {
     mode: 'add',
-    pId: row.id
+    labelParentId: row.id,
+    labelType: row.labelType
   }
   state.detail.show = true
 }
+const onEdit = (row) => {
+  state.detail.transfer = {
+    mode: 'edit',
+    id: row.id,
+  }
+  state.detail.show = true
+}
+const onDel = (row) => {
+  ElMessageBox.confirm(`请确认是否删除${row.labelName}?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  } as any).then(() => {
+    state.loading = true
+    proxy.$api.sysLabelDelete(row.id).then(res => {
+      if (res.code === 200) {
+        ElMessage.success('删除成功！')
+      } else {
+        ElMessage.error(res.msg)
+      }
+      initTree()
+    })
+  }).catch(() => {})
+}
+const onRelation = (row) => {
+  state.relation.transfer = {
+    id: row.id
+  }
+  state.relation.show = true
+}
 const initDictionary = () => {
   DictionaryStore.initDict('label_type')
 }

src/views/manage/type/relation.vue

@@ -0,0 +1,171 @@
+<template>
+  <CusDialog
+    :show="show"
+    title="关联索引"
+    @onClose="$emit('update:show', false)"
+    width="90%"
+    height="90%"
+    :show-submit="false"
+    :loading="state.loading"
+  >
+    <div class="__cus-manage_content">
+      <div class="__cus-manage_content-filters" v-loading="state.loadingIndex">
+        <el-autocomplete
+          ref="ref_search"
+          v-model="state.indexSelect"
+          :fetch-suggestions="fetchSuggestions"
+          clearable
+          placeholder="搜索添加索引"
+          @select="handleSelect"
+          :select-when-unmatched="true"
+        >
+          <template #default="{ item }">
+            <div class="index-item" v-html="item.html"/>
+          </template>
+        </el-autocomplete>
+      </div>
+      <div class="__cus-manage_content-main" v-loading="state.query.loading">
+        <CusTable
+          :data="state.query.result.data"
+          :table-head="state.query.tableHead"
+          :no-page="true"
+        >
+          <template #do-column-value="{scope}">
+            <CusButton type="table-del" @click="onDel(scope.row)"/>
+          </template>
+        </CusTable>
+      </div>
+    </div>
+  </CusDialog>
+</template>
+
+<script setup lang="ts">
+import {computed, getCurrentInstance, nextTick, reactive, ref, watch} from "vue";
+import {useDictionaryStore} from "@/stores";
+import {ElMessage, ElMessageBox} from "element-plus";
+import DetailCom from "@/views/manage/type/detail.vue";
+import {
+  sysLabelAddIndexToLabel, sysLabelDeleteLink,
+  sysLabelGetAllIndexsByKey,
+  sysLabelGetAllSysLabelTypes
+} from "@/api/modules/manage/type";
+
+const emit = defineEmits(['update:show'])
+const {proxy} = getCurrentInstance()
+const DictionaryStore = useDictionaryStore()
+const props = defineProps({
+  show: {default: false},
+  transfer: {}
+ })
+const state: any = reactive({
+  loading: false,
+  query: {
+    loading: false,
+    tableHead: [
+      {value: "indexName", label: "索引中文", fixed: 'left'},
+      {value: "indexTableName", label: "索引表名", fixed: 'left', popover: true},
+      {value: "num", label: "数据量", width: 100},
+      {value: "linkTime", label: "关联时间", width: 200},
+      {value: "do", label: "操作", width: 100, fixed: 'right'},
+    ],
+    result: {
+      data: []
+    }
+  },
+  loadingIndex: false,
+  indexList: [],
+  indexSelect: ''
+})
+const ref_search = ref()
+const fetchSuggestions = (queryString: string, cb: any) => {
+  const arr = state.indexList.filter(v => state.query.result.data.every(s => s.indexId != v.id))
+  const results = queryString
+    ? arr.filter(v => [v.indexName, v.indexTableName].some(s => s.includes(queryString)))
+    : arr
+  results.map(v => {
+    const str1 = queryString ? v.indexName.replace(new RegExp(queryString, 'g'), `<em>${queryString}</em>`) : v.indexName
+    const str2 = queryString ? v.indexTableName.replace(new RegExp(queryString, 'g'), `<em>${queryString}</em>`) : v.indexTableName
+    v.html = `${str1}<span style="margin-right: 20px;"></span>${str2}`
+    return v
+  })
+  cb(results)
+}
+const handleSelect = (item) => {
+  console.log(item)
+  ElMessageBox.confirm(`是否添加${item.indexName}?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  } as any).then(() => {
+    state.loading = true
+    proxy.$api.sysLabelAddIndexToLabel(proxy.$util.formatGetParam({
+      indexId: item.id,
+      typeId: props.transfer.id
+    })).then(res => {
+      if (res.code === 200) {
+        ElMessage.success('添加成功！')
+        state.loading = false
+        ref_search.value?.blur()
+        initRelation()
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  }).catch(() => {})
+}
+const initIndex = () => {
+  state.loadingIndex = true
+  proxy.$api.sysLabelGetAllIndexsByKey().then(res => {
+    if (res.code === 200) {
+      state.indexList = res.data
+      state.loadingIndex = false
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const initRelation = () => {
+  state.query.loading = true
+  proxy.$api.sysLabelGetAllSysLabelTypes(props.transfer.id).then(res => {
+    if (res.code === 200) {
+      state.query.result.data = res.data
+      state.query.loading = false
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const onDel = (row) => {
+  ElMessageBox.confirm(`请确认是否删除${row.indexName}?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  } as any).then(() => {
+    state.loading = true
+    proxy.$api.sysLabelDeleteLink(row.id).then(res => {
+      if (res.code === 200) {
+        ElMessage.success('删除成功！')
+        state.loading = false
+        initRelation()
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  }).catch(() => {})
+}
+watch(() => props.show, (n) => {
+  if (n) {
+    initIndex()
+    initRelation()
+  }
+})
+const initDictionary = () => {
+}
+</script>
+
+<style lang="scss" scoped>
+.__cus-manage_content {
+  margin-bottom: 0;
+  height: calc(100% - 24px);
+}
+</style>

src/views/web/list/index.vue

@@ -378,7 +378,7 @@ const initResultTree = () => {
 }
 const getIndexConfig = () => {
   state.resultParams.indexConfig = {}
-  proxy.$api.frontGetIndexAndFieldInfo(`id=${WebStore.searchAreaIndexMap.get(state.resultParams.activeIndex).id}`).then(res => {
+  proxy.$api.frontGetIndexAndFieldInfo(`id=${WebStore.searchAreaIndexMap.get(state.resultParams.activeIndex).indexId}`).then(res => {
     state.resultParams.indexConfig = res.data
     state.ws.list()
   })