vue2-client 1.8.102 → 1.8.104

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.103-1.8.104 -2024-3-14 @张振宇**
+- 增加对话库功能
+- 修复xbadge不更新展示问题
+
 **1.8.102 -2024-3-14 @张振宇**
 - microapp环境下使用 replace 跳转路由
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.102",
+  "version": "1.8.104",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XBadge/XBadge.vue

@@ -22,11 +22,11 @@ export default {
   props: {
     badgeKey: {
       type: String,
-      required: true
+      required: true,
     },
     value: {
       type: [Number, String],
-      required: true
+      required: true,
     },
     replaceText: {
       type: String,
@@ -38,22 +38,34 @@ export default {
     }
   },
   computed: {},
+  watch: {
+    badgeKey (newVal, oldVal) {
+      this.updateDictionary()
+    },
+    value (newVal, oldVal) {
+      this.updateDictionary()
+    }
+  },
   data () {
     return {
       dictionary: undefined
     }
   },
   created () {
-    const result = this.$appdata.getParam(this.badgeKey, this.value)
-    if (result) {
-      this.dictionary = result
-      return
-    }
-    this.$appdata.getDictValue(this.badgeKey, this.value, res => {
-      this.dictionary = res
-    })
+    this.updateDictionary()
   },
   methods: {
+    // todo 修改方式  想办法不使用回调方式
+    updateDictionary () {
+      const result = this.$appdata.getParam(this.badgeKey, this.value)
+      if (result) {
+        this.dictionary = result
+        return
+      }
+      this.$appdata.getDictValue(this.badgeKey, this.value, undefined, res => {
+        this.dictionary = res
+      })
+    },
     badgeFilter (key, value) {
       return this.$appdata.getParam(key, value)
     }

package/src/base-client/plugins/AppData.js

@@ -53,19 +53,19 @@ const GetAppDataService = {
     const object = JSON.parse(str)
     return object[key]
   },
-  getDictValue (dictKey, value, callback) {
+  getDictValue (dictKey, value, func) {
     getConfigByName(dictKey, undefined, result => {
       for (const item of result.value) {
         if (item.value == value) {
-          callback({
+          func({
             status: item.status || 'none',
             text: item.label
           })
         }
       }
-      callback({
+      func({
         status: 'none',
-        text: item.label
+        text: value
       })
     })
   },

package/src/pages/DynamicStatistics/DataTabs.vue

@@ -6,7 +6,7 @@
     <a-row>
       <ChartSelector :rawData="pane.content" v-if="pane?.content?.length"/>
     </a-row>
-    <EvaluationArea :uuid="pane.key" v-if="pane.key && pane.content"/>
+    <EvaluationArea :uuid="pane.key" v-if="pane.key && pane.content" @submitEvaluationLib="submitEvaluationLib"/>
   </a-row>
 </template>
 
@@ -33,6 +33,9 @@ export default {
     this.pane = {}
   },
   methods: {
+    submitEvaluationLib (value, uuid) {
+     this.$emit('submitEvaluationLib', value, uuid)
+    },
     show (obj) {
       const { uuid, question, data } = obj
       this.pane = { title: question, content: data, key: uuid }

package/src/pages/DynamicStatistics/EvaluationArea.vue

@@ -32,7 +32,11 @@ export default {
   methods: {
     submitEvaluation (result) {
       const key = 'question-' + this.uuid
+      let flag = true
       indexedDB.get(key, (item) => {
+        flag = false
+        // 收藏状态不存储到库里
+        delete item.isFavorite
         const content = Object.assign(item, {
           evaluation: result
         })
@@ -48,6 +52,10 @@ export default {
           indexedDB.add(key, content)
         })
       })
+      // 如果 indexedDB 没有获取到说明是对话库的数据
+      if (flag) {
+        this.$emit('submitEvaluationLib', result, this.uuid)
+      }
     }
   }
 }

package/src/pages/DynamicStatistics/QuestionHistoryAndFavorites.vue

@@ -1,5 +1,10 @@
 <template>
-  <a-card class="question-history" id="question-history" size="small" :bordered="false" :bodyStyle="{ height:'100%', overflowY: 'auto'}">
+  <a-card
+    class="question-history"
+    id="question-history"
+    size="small"
+    :bordered="false"
+    :bodyStyle="{ height:'100%', overflowY: 'auto'}">
     <a-tabs v-model="activeKey" :tabBarStyle="{ textAlign: 'center',height:'100%' }" tabPosition="top">
       <a-tab-pane key="1" tab="对话历史">
         <a-list item-layout="horizontal" :data-source="questions">
@@ -32,7 +37,7 @@
                 <a-icon
                   type="star"
                   :class="renderItem.isFavorite ? 'startActive' : 'startInactive'"
-                  @click.stop="toFavorites(renderItem,index)"
+                  @click.stop="toFavorites(renderItem,index,'lib')"
                   :theme=" renderItem.isFavorite ? 'filled': 'twoTone'"
                   two-tone-color="#FFD700"/>
               </a-tooltip>
@@ -76,6 +81,61 @@
           </a-list-item>
         </a-list>
       </a-tab-pane>
+      <a-tab-pane key="3" tab="对话库">
+        <a-button type="dashed" class="pullQuestion" :loading="pullQuestionLoading" @click="pullQuestion">
+          拉取对话
+        </a-button>
+        <a-list item-layout="horizontal" :data-source="questionsLib">
+          <a-list-item
+            slot="renderItem"
+            class="questionItem"
+            :class="[renderItem.sql ? (renderItem.uuid === currentuuid ? 'question-history-active' : 'question-history-inactive') : (renderItem.uuid === currentuuid ? 'question-history-active-bug' : 'question-history-inactive-bug'),
+                     index===0 || questionsLib[index].date !== questionsLib[index-1].date ? 'mgtop-20' : '']"
+            slot-scope="renderItem,index"
+            @click="handleOnlyOpen(renderItem)">
+            <a-divider v-if="index===0 || questionsLib[index].date !== questionsLib[index-1].date" class="questionItemDivider">
+              {{ timeAgo(renderItem.date) }}
+            </a-divider>
+            <a-list-item-meta
+              :description="renderItem.date"
+            >
+              <span slot="title">
+                {{ renderItem.question }}
+                <br/>
+                <span class="evaluation" v-if="icons[renderItem.evaluation]">
+                  <a-icon
+                    :type="icons[renderItem.evaluation].icon"
+                    theme="twoTone"
+                    style="font-size: 1rem"
+                    :two-tone-color="icons[renderItem.evaluation].color"/>
+                  【{{ icons[renderItem.evaluation].text }}】
+                </span>
+                <span class="evaluation" v-else>
+                  <a-icon type="message" style="font-size: 1rem" theme="twoTone" two-tone-color="#999"/>
+                  未评价
+                </span>
+              </span>
+            </a-list-item-meta>
+            <a-space>
+              <a-tooltip :title="renderItem.isFavorite ? '取消收藏' : '收藏'" v-if="renderItem.sql">
+                <a-icon
+                  type="star"
+                  :class="renderItem.isFavorite ? 'startActive' : 'startInactive'"
+                  @click.stop="libToFavorites(renderItem,index)"
+                  :theme=" renderItem.isFavorite ? 'filled': 'twoTone'"
+                  two-tone-color="#FFD700"/>
+              </a-tooltip>
+              <a-tooltip title="重新查询" v-else>
+                <a-icon
+                  @click.stop="reTrySearch(renderItem, index)"
+                  type="sync"
+                  class="reSearch"
+                  title="重新查询"/>
+              </a-tooltip>
+            </a-space>
+          </a-list-item>
+        </a-list>
+      </a-tab-pane>
     </a-tabs>
     <a-modal
       width="1200px"
@@ -122,6 +182,7 @@
 <script>
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { formatDate } from '@vue2-client/utils/util'
+import { post } from '@/services/api'
 
 export default {
   props: {
@@ -133,37 +194,135 @@ export default {
   data () {
     return {
       activeKey: '1',
+      actions: [
+        { type: 'star-o', text: '156' },
+        { type: 'like-o', text: '156' },
+        { type: 'message', text: '2' },
+      ],
       questions: [], // 你的问题历史
       favorites: [], // 你的收藏问题
+      questionsLib: [], // 对话库
+      icons: {
+        0: {
+          icon: 'like',
+          text: '满意'
+        },
+        1: {
+          icon: 'dislike',
+          text: '不满意',
+          color: '#FF4F53'
+        },
+        2: {
+          icon: 'frown',
+          text: '待改进',
+          color: '#52c41a'
+        }
+      }, // 对话库
       // 元数据窗口
       metaDataModalVisible: false,
-      item: {}
+      item: {},
+      pullQuestionLoading: false
     }
   },
   mounted () {
     this.loadData()
   },
   methods: {
+    // 根据时间yyyy-mm-dd hh24:mi:ss判断是刚刚？今天？昨天？还是更早？
+    timeAgo (time) {
+      const now = new Date()
+      const date = new Date(time)
+      const diff = now - date
+      const day = 24 * 60 * 60 * 1000
+      if (diff < 60 * 60 * 1000) {
+        return '刚刚'
+      } else if (diff < day) {
+        return '今天'
+      } else if (diff < day * 2) {
+        return '昨天'
+      } else {
+        return time.substring(0, 10)
+      }
+    },
+    pullQuestion () {
+      this.pullQuestionLoading = true
+      post('/api/af-system/logic/openapi/getCommonData', {
+        type: 'ai-question',
+        content: ''
+      }).then(res => {
+        res.forEach(item => {
+          const _item = JSON.parse(item.f_json)
+          if (_item.data && _item.data.length) {
+            if (!this.questionsLib.some(_ => _.uuid === _item.uuid)) {
+              _item.date = formatDate('now')
+              this.questionsLib.push(_item)
+              indexedDB.add('question-lib-' + _item.uuid, _item)
+            }
+          }
+        })
+        this.pullQuestionLoading = false
+      }).catch(e => {
+        this.pullQuestionLoading = false
+      })
+    },
     loadData () {
       this.questions = []
       this.favorites = []
       indexedDB.getAll((data) => {
           // 遍历data，将question和favorites分别赋值给questions和favorites
           for (const datum of data) {
-            if (datum.key.includes('question')) {
-              this.questions.push(datum.data)
+            if (datum.key.includes('question-lib')) {
+              this.questionsLib.push(datum.data)
             } else if (datum.key.includes('favorites')) {
               this.favorites.push(datum.data)
+            } else if (datum.key.includes('question')) {
+              this.favorites.push(datum.data)
             }
           }
           this.questions.sort((a, b) => new Date(b.date) - new Date(a.date))
           this.favorites.sort((a, b) => new Date(b.date) - new Date(a.date))
+          this.questionsLib.sort((a, b) => new Date(b.date) - new Date(a.date))
         }
       )
     },
     handleOpenFavorite (item) {
       this.$emit('handleOpenFavorite', item)
     },
+    handleOnlyOpen (item) {
+      this.$emit('handleOnlyOpen', item)
+    },
+    submitEvaluationLib (value, uuid) {
+      // 根据uuid 在 questionslib里卖弄找到这个对象
+      const item = this.questionsLib.find(item => item.uuid === uuid)
+      const key = 'question-lib-' + uuid
+      // 收藏状态不存储到库里
+      delete item.isFavorite
+      const content = Object.assign(item, {
+        evaluation: value
+      })
+      // 使用 content 替换 item
+      this.questionsLib = this.questionsLib.map(_item => {
+        if (_item.uuid === uuid) {
+          _item = content
+        }
+        return _item
+      })
+      if (content.sql) {
+        // 处理sql的单引号
+        content.sql = content.sql.replaceAll(/'/g, "''")
+      }
+      console.log(content)
+      // 保存到数据库中
+      post('/api/af-system/logic/openapi/updateCommonData', {
+        type: 'ai-question',
+        content: uuid,
+        newContent: content
+      }).then(res => {
+        this.$message.success('评论成功')
+        indexedDB.delete(key)
+        indexedDB.add(key, content)
+      })
+    },
     reTrySearch (item, index) {
       this.delQuestion(item, index)
       this.$emit('handleSearch', item.question, null, item.uuid)
@@ -215,6 +374,29 @@ export default {
       }
       this.updateQuestion(question)
     },
+    libToFavorites (question, index) {
+      this.questionsLib[index].isFavorite = !this.questionsLib[index].isFavorite
+      this.questionsLib = JSON.parse(JSON.stringify(this.questionsLib))
+      if (this.questionsLib[index].isFavorite) {
+        const key = 'favorites-' + question.uuid
+        question.isFavorite = true
+        // 避免从其他地方收藏了这个 uuid
+        indexedDB.delete(key)
+        indexedDB.add(key, question)
+        this.favorites.push(Object.assign({}, question, { date: formatDate('now') }))
+        this.$message.success('收藏成功')
+      } else {
+        // 根据 uuid 删除 favorites 中的对应项
+        this.favorites = this.favorites.filter(item => item.uuid !== question.uuid).sort((a, b) => new Date(b.date) - new Date(a.date))
+        // 删除收藏的储存
+        const key = 'favorites-' + question.uuid
+        indexedDB.delete(key)
+      }
+
+      const questionKey = 'question-lib-' + question.uuid
+      indexedDB.delete(questionKey)
+      indexedDB.add(questionKey, this.questionsLib[index])
+    },
     delQuestion (item, index) {
       // 删除对话历史
       this.questions.splice(index, 1)
@@ -271,13 +453,13 @@ export default {
 
   .question-history-inactive-bug {
     border-radius: 4px;
-    padding : 18px;
+    padding: 18px;
     background-color: rgba(#ff0000, 0.04);
   }
 
   .question-history-inactive {
     border-radius: 4px;
-    padding : 18px;
+    padding: 18px;
   }
 
   .ant-list-item-meta /deep/ {
@@ -357,6 +539,27 @@ export default {
       transform: rotate(0deg);
     }
   }
+
+  .pullQuestion {
+    width: 100%;
+    margin-bottom: 10px;
+  }
+
+  .evaluation {
+
+  }
+  .mgtop-20{
+    margin-top: 20px;
+  }
+
+  .questionItemDivider {
+    position: absolute;
+    top:-25px
+  }
+
+  .questionItem {
+    position: relative;
+  }
 }
 
 </style>

package/src/pages/DynamicStatistics/index.vue

@@ -21,6 +21,7 @@
           <question-history-and-favorites
             ref="qhaf"
             @handleOpenFavorite="handleOpenFavorite"
+            @handleOnlyOpen="handleOnlyOpen"
             :currentuuid="currentuuid"
             @handleSearch="handleSearch">
           </question-history-and-favorites>
@@ -32,6 +33,7 @@
               v-show="!loading"
               ref="tabs"
               @tab-change="handleTabChange"
+              @submitEvaluationLib="submitEvaluationLib"
               @remove-cache="remove"
             ></data-tabs>
           </a-spin>
@@ -77,7 +79,7 @@ export default {
       indexedDB.getAll((data) => {
         let evaluation = true
         for (const datum of data) {
-          if (datum.key.includes('question')) {
+          if (datum.key.includes('question') && !datum.key.includes('question-lib')) {
             const item = datum.data
             console.warn(item)
             if (item.evaluation === undefined && item.sql) {
@@ -169,6 +171,15 @@ export default {
     handleOpenFavorite (item) {
       this.addTab(item)
     },
+    // 处理从对话历史/收藏夹打开收藏项
+    handleOnlyOpen (item) {
+      this.$refs.tabs.show(item)
+    },
+    submitEvaluationLib (value, uuid) {
+      console.log(value, uuid)
+      this.currentuuid = uuid
+      this.$refs.qhaf.submitEvaluationLib(value, uuid)
+    },
     uuid () {
       const tempUrl = URL.createObjectURL(new Blob())
       const uuid = tempUrl.toString() // blob:https://xxx.com/b250d159-e1b6-4a87-9002-885d90033be3

package/vue.config.js

@@ -12,7 +12,7 @@ const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
 const v3Server = 'http://121.36.106.17:8400'
-const gateway = 'http://192.168.50.67:31567'
+const gateway = 'http://192.168.50.67:31467'
 // v3 铜川
 // const v3Server = 'http://61.134.55.234:8405'
 // const gateway = 'http://61.134.55.234:8456/webmeter'