添加字段

src/stores/indexDB.ts

@@ -1,6 +1,8 @@
 import {defineStore} from "pinia";
 import {readonly} from "vue";
 import {ElLoading, ElNotification} from "element-plus";
+import {useThemeStore} from "@/stores/theme";
+
 
 export const useIndexDBStore = defineStore('indexDB', {
   state: () => ({
@@ -15,7 +17,7 @@ export const useIndexDBStore = defineStore('indexDB', {
         const loading = ElLoading.service({
           lock: true,
           text: '数据库加载中',
-          background: 'rgba(0, 0, 0, 0.3)',
+          background: useThemeStore().loadingBg,
         })
         const request: any = window.indexedDB.open('SmartSearch', 1)
         request.onerror = (event) => {}
@@ -37,7 +39,7 @@ export const useIndexDBStore = defineStore('indexDB', {
         const loading = ElLoading.service({
           lock: true,
           text: '查询参数构建中',
-          background: 'rgba(0, 0, 0, 0.3)',
+          background: useThemeStore().loadingBg,
         })
         const timestamp = String(new Date().getTime())
         const obj = {
@@ -56,7 +58,7 @@ export const useIndexDBStore = defineStore('indexDB', {
         const loading = ElLoading.service({
           lock: true,
           text: '查询参数解析中',
-          background: 'rgba(0, 0, 0, 0.3)',
+          background: useThemeStore().loadingBg,
         })
         const re = this.DB.transaction(['timestamp']).objectStore('timestamp').get(timestamp)
         re.onsuccess = (e: any) => {
@@ -83,7 +85,7 @@ export const useIndexDBStore = defineStore('indexDB', {
         const loading = ElLoading.service({
           lock: true,
           text: '数据库创建中',
-          background: 'rgba(0, 0, 0, 0.3)',
+          background: useThemeStore().loadingBg,
         })
         if (this.DB.objectStoreNames.contains('timestamp')) {
           const oldRe = this.DB.transaction(['timestamp'])?.objectStore('timestamp')
@@ -93,12 +95,12 @@ export const useIndexDBStore = defineStore('indexDB', {
               this.DB.transaction(['timestamp'], 'readwrite').objectStore('timestamp').delete(cursor.primaryKey)
               cursor.continue();
             } else {
-              resolve()
+              resolve('')
               loading.close()
             } 
           }
         } else {
-          resolve()
+          resolve('')
           loading.close()
         }
       })

src/views/manage/index/index.vue

@@ -8,6 +8,13 @@
           v-model:param="state.query.form.keyword"
           placeholder="请输入索引中文名称或索引表名进行搜索"
         />
+        <CusFormColumn
+          :span="4"
+          label="已创建索引"
+          v-model:param="state.query.form.isCreateEsIndex"
+          link="radio"
+          :options="DictionaryStore.trueFalseList"
+        />
         <CusButton type="main" title="搜索" @click="onSearch"/>
         <CusButton type="main" title="重置" @click="onReset"/>
         <CusButton title="导出" style="margin-left: auto" @click="onExport"/>
@@ -32,6 +39,9 @@
         <template #themeMode-column-value="{scope}">
           {{DictionaryStore.themeModeMap.get(scope.row.themeMode)}}
         </template>
+        <template #isCreateEsIndex-column-value="{scope}">
+          {{DictionaryStore.trueFalseMap.get(scope.row.isCreateEsIndex)}}
+        </template>
         <template #do-column-value="{scope}">
           <CusButton type="table-add" title="创建索引" @click="onCreate(scope.row)"/>
           <CusButton type="table" icon="relation" title="关联分类" @click="onRelation(scope.row)"/>
@@ -88,6 +98,7 @@ const state: any = reactive({
       {value: "columnModelNum", label: "列模式列数", width: 180},
       {value: "num", label: "数据量", width: 180},
       {value: "linkTypeNum", label: "关联分类数量", width: 180},
+      {value: "isCreateEsIndex", label: "已创建索引", width: 180},
       {value: "createTime", label: "创建时间", width: 200},
       {value: "updateTime", label: "最后修改时间", width: 200},
       {value: "remark", label: "备注", width: 200},
@@ -232,6 +243,7 @@ const initDictionary = () => {
   DictionaryStore.initDict('gx_cycle')
   DictionaryStore.initDict('theme_mode')
   DictionaryStore.initDict('default_model')
+  DictionaryStore.initDict('true_false')
 }
 onMounted(() => {
   initDictionary()

src/views/manage/index/text-detail.vue

@@ -51,6 +51,14 @@
         <CusFormColumn
           :span="12"
           required
+          label="是否主键"
+          v-model:param="state.form.fieldIdKey"
+          link="radio"
+          :options="DictionaryStore.trueFalseList"
+        />
+        <CusFormColumn
+          :span="12"
+          required
           label="搜索权重"
           v-model:param="state.form.searchWeight"
           link="input-number"
@@ -211,7 +219,8 @@ watch(() => props.show, (n) => {
         indexId: props.transfer.indexId,
         pictureField: '0',
         labelLength: 1,
-        dataOrder: 999
+        dataOrder: 999,
+        fieldIdKey: '0'
       }
     } else {
       state.form = JSON.parse(JSON.stringify(props.transfer.row))

src/views/manage/theme/index.vue

@@ -91,7 +91,7 @@ const state: any = reactive({
       {value: "createBy", label: "创建人"},
       {value: "updateTime", label: "最后修改时间", width: 200},
       {value: "updateBy", label: "最后修改人"},
-      {value: "do", label: "操作", width: 280, fixed: 'right'},
+      {value: "do", label: "操作", width: 300, fixed: 'right'},
     ],
     form: {},
     formReal: {},

src/views/manage/theme/relation.vue

@@ -80,7 +80,7 @@ const state: any = reactive({
       {value: "fieldName", label: "关联索引"},
       {value: "weight", label: "权重"},
       {value: "description", label: "关系描述"},
-      {value: "do", label: "操作", width: 320, fixed: 'right'},
+      {value: "do", label: "操作", width: 360, fixed: 'right'},
     ],
     result: {
       data: []

src/views/web/home/index.vue

@@ -73,7 +73,7 @@
 <script setup lang="ts">
 import {computed, getCurrentInstance, onMounted, reactive} from "vue";
 import router from "@/router";
-import {ElMessage} from "element-plus";
+import {ElLoading, ElMessage} from "element-plus";
 import {useAppStore, useThemeStore, useWebStore, useIndexDBStore} from "@/stores";
 import {mockGetSearchHistory} from "@/api/modules/mock/mock";
 import {searchLogsGetKeyWordByUserId} from "@/api/modules/web/list";
@@ -130,9 +130,15 @@ const initHistory = () => {
   })
 }
 const initArea = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '查询范围加载中',
+    background: ThemeStore.loadingBg,
+  })
   WebStore.getSearchAreaTree().then(({roleTree}: any) => {
     state.areaList = JSON.parse(JSON.stringify(roleTree))
     state.areaTab = state.areaList[0]?.treeId
+    loading.close()
   })
 }
 const onIndexTabAll = () => {

src/views/web/list/index.vue

@@ -460,6 +460,7 @@ const initWS = () => {
   let lastCountParams = ''
   let lastCountStep = 0
   let lastCountStep_ = 0
+  let countLoading: any = null
   let lastListParams = ''
   let lastDetailParams = ''
   ws.onopen = (e) => {
@@ -473,6 +474,8 @@ const initWS = () => {
         const p = JSON.parse(lastCountParams)
         p.flag = 'stop'
         ws.send(JSON.stringify(p))
+        countLoading?.close()
+        countLoading = null
       }
       // 如果有的话，终止上一次请求
       if (lastListParams) {
@@ -507,6 +510,11 @@ const initWS = () => {
         orderBy: {}
       }
       lastCountParams = JSON.stringify(params)
+      countLoading = ElLoading.service({
+        lock: true,
+        text: '数据查询中',
+        background: useThemeStore().loadingBg,
+      })
       ws.send(lastCountParams)
     }
     state.ws.list = (init = true) => {
@@ -587,6 +595,8 @@ const initWS = () => {
             const p = JSON.parse(lastCountParams)
             // 返回为最新批次的
             if (json.timestamp == p.timestamp) {
+              countLoading?.close()
+              countLoading = null
               const resTag = json.datas
               const resType = resTag.datas[0]
               state.resultParams.tree.forEach(tag => {