vue2-client 1.8.80 → 1.8.82

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.82 -2024-3-7 @江超**
+- 删除过时组件
+- XFormItem的下拉框数据源现在支持从配置中心获取了
+- 待解决：XTable显示来自配置中心的字典徽标
+
 **1.8.79 -2024-3-6 @江超**
 - 增加实体保存的方法
 

package/package.json

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

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -35,17 +35,25 @@
         <template v-if="attr.keys">
           <a-select-option
             v-for="(item,index) in attr.keys"
-            :key="index"
+            :key="index.value"
             :value="item.value">
             {{ item.label }}
           </a-select-option>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1">
+          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
             <a-select-option
               v-for="(item,index) in option"
-              :key="index"
-              :value="item.value">{{ item.label }}
+              :key="index.value"
+              :value="item.value">
+              <template v-if="attr.keyName.indexOf('config@') !== -1 && item.status">
+                <!-- 徽标(badge) -->
+                <a-badge v-if="item.status !== 'gary'" :color="item.status" :text="item.label"/>
+                <a-badge v-else color="#D9D9D9" :text="item.label"/>
+              </template>
+              <template v-else>
+                {{ item.label }}
+              </template>
             </a-select-option>
           </template>
           <template v-else>
@@ -111,7 +119,7 @@
           </a-select-option>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1">
+          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
             <a-select-option
               v-for="(item,index) in option"
               :key="index"
@@ -163,7 +171,7 @@
           </a-radio>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1">
+          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
             <a-radio v-for="(item,index) in option" :key="index" :value="item.value">
               {{ item.label }}
             </a-radio>
@@ -313,7 +321,7 @@ import AddressSearchCombobox from '@vue2-client/base-client/components/common/Ad
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import moment from 'moment'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
-import { runLogic } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XFormItem',
@@ -428,26 +436,32 @@ export default {
         }
       }
       if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
-        this.getData({}, res => {
-          this.option = res
-          if (this.attr.type === 'treeSelect') {
-            this.$refs.xTreeSelect.init({
-              option: this.option,
-              form: this.form,
-              queryType: this.attr.queryType,
-              name: this.attr.name,
-              model: this.attr.model,
-              mode: this.mode,
-              disabled: this.disabled
-            })
-          } else if (this.attr.type === 'radio') {
-            this.initRadioValue()
-          }
+        this.getData({}, res => this.getDataCallback(res))
+      } else if (this.attr.keyName && this.attr.keyName.indexOf('config@') !== -1) {
+        const configName = this.attr.keyName.substring(7)
+        getConfigByName(configName, this.serviceName, res => {
+          this.getDataCallback(res.value)
         })
       } else {
         this.initRadioValue()
       }
     },
+    getDataCallback (res) {
+      this.option = res
+      if (this.attr.type === 'treeSelect') {
+        this.$refs.xTreeSelect.init({
+          option: this.option,
+          form: this.form,
+          queryType: this.attr.queryType,
+          name: this.attr.name,
+          model: this.attr.model,
+          mode: this.mode,
+          disabled: this.disabled
+        })
+      } else if (this.attr.type === 'radio') {
+        this.initRadioValue()
+      }
+    },
     initRadioValue () {
       const model = this.attr.model
       if (this.mode === '新增/修改' && this.attr.type === 'radio' && !this.form[model]) {

package/src/base-client/components/index.js

@@ -10,12 +10,8 @@ import XCard from './common/XCard'
 import XBadge from './common/XBadge'
 import Upload from './common/Upload'
 import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
 import AddressSearchCombobox from './common/AddressSearchCombobox'
 import AmapMarker from './common/AmapMarker'
-// import CreateQuery from './common/CreateQuery'
-// import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
 import PersonSetting from './common/PersonSetting'
 import XFormTable from './common/XFormTable'
 import XStepView from './common/XStepView'
@@ -34,8 +30,6 @@ export default {
   XBadge,
   Upload,
   JSONToTree,
-  FormGroupEdit,
-  FormGroupQuery,
   AddressSearchCombobox,
   AmapMarker,
   // CreateQuery,

package/src/pages/DynamicStatistics/ChartSelector.vue

@@ -88,19 +88,33 @@ export default {
     },
     initializeOptions () {
       if (this.rawData.length > 0) {
-        const firstRow = this.rawData[0]
-        this.groupOptions = Object.keys(firstRow).filter(key => typeof firstRow[key] === 'string' ||
+        const row = this.rawData[0]
+        this.groupOptions = Object.keys(row).filter(key => typeof row[key] === 'string' ||
           this.isYearArray(this.rawData, key))
-        this.valueOptions = Object.keys(firstRow).filter(key => typeof firstRow[key] === 'number' &&
-        !this.isYearArray(this.rawData, key))
+        this.valueOptions = Object.keys(row).filter(key => {
+          return !isNaN(parseFloat(row[key])) && isFinite(row[key]) && !this.isYear(row[key])
+        })
+        console.warn(this.valueOptions)
       }
     },
     isYearArray (arr, key) {
-      return arr.every(item => this.isYear(item[key]))
+      if (arr.some(item => this.isYear(item[key]))) {
+        this.updateNonYearItems(arr, key)
+        return true
+      }
+      return false
+    },
+    // 修改数组中不满足条件的元素的特定键值为1970
+    updateNonYearItems (arr, key) {
+      arr.forEach(item => {
+        if (!this.isYear(item[key])) {
+          item[key] = 1970
+        }
+      })
     },
     // 判断数值或者字符串是不是年份
     isYear (value) {
-      return /^20\d{2}$/.test(value)
+      return /^(19|20)\d{2}$/.test(value)
     },
     updateCharts () {
       this.renderPieChart()

package/src/pages/DynamicStatistics/DynamicTable.vue

@@ -28,7 +28,7 @@ export default {
   props: {
     tableData: {
       type: Array,
-      required: true
+      default: () => ([])
     }
   },
   watch: {
@@ -43,6 +43,9 @@ export default {
     async initData () {
       try {
         // 从数据第一项推断列信息
+        if (this.tableData.length === 0) {
+          return
+        }
         const sample = this.tableData[0]
         this.tableColumns = Object.keys(sample).map(key => ({
           title: key, // 使用键名作为列标题

package/src/pages/DynamicStatistics/QuestionHistoryAndFavorites.vue

@@ -1,6 +1,6 @@
 <template>
   <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%',postion:'' }" tabPosition="top">
+    <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">
           <a-list-item
@@ -95,6 +95,8 @@ export default {
               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))
         }
       )
     },

package/src/pages/DynamicStatistics/SearchBar.vue

@@ -1,13 +1,21 @@
 <template>
   <div class="search-bar">
+    <a-select default-value="all" class="select" @change="handleChange">
+      <a-select-option v-for="d in selectOption" :key="d.value">
+        {{ d.text }}
+      </a-select-option>
+    </a-select>
     <a-auto-complete
       v-model="searchInput"
       class="search-input"
+      ref="autoComplete"
       placeholder="请输入查询的内容"
       option-label-prop="title"
+      :open="true"
       @select="onSearch"
-      @search="handleSearch"
+      @search="fetchFunction"
     >
+      <a-spin v-if="searching" slot="notFoundContent" size="small" />
       <template slot="dataSource">
         <a-select-option v-for="item in dataSourceResults" :key="item.category" :title="item.category">
           <span>{{ item.category.substr(0,item.category.indexOf(searchInput)) }}</span>
@@ -33,19 +41,30 @@
 <script>
 import FavoriteList from './FavoriteList.vue'
 import { post } from '@vue2-client/services/api'
+import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
 
 export default {
   name: 'SearchBar',
   components: { FavoriteList },
   data () {
+    // 检索去抖
+    this.fetchFunction = debounce(this.fetchFunction, 300)
     return {
+      // 最后检索版本
+      lastFetchId: 0,
+      searching: false,
       searchInput: '', // 绑定搜索输入框的数据,
       favoriteState: false, // 是否收藏
       obj: undefined,
       favoriteListVisible: false,
       loading: false,
-      dataSource: [],
       dataSourceResults: [],
+      selectOption: [
+        { value: 'all', text: '全部' },
+        { value: '合同', text: '合同类' },
+        { value: '项目', text: '项目类' },
+        { value: '人员', text: '人员类' },
+      ]
     }
   },
   computed: {
@@ -54,13 +73,39 @@ export default {
     this.init()
   },
   methods: {
-    handleSearch (value) {
-      if (value) {
-        this.dataSourceResults = this.dataSource.filter(
-          item => item.category.indexOf(value) !== -1
-        )
+    handleChange (value) {
+      if (value === 'all') {
+        this.searchInput = ''
       } else {
-        this.dataSourceResults = []
+        this.searchInput = value
+      }
+      this.dataSourceResults = []
+      this.fetchFunction(this.searchInput)
+      this.$refs.autoComplete.focus()
+    },
+    fetchFunction (value) {
+      this.dataSourceResults = []
+      if (value) {
+        this.searching = true
+        this.lastFetchId += 1
+        const fetchId = this.lastFetchId
+        post('/api/af-system/logic/openapi/getCommonData', {
+          type: 'ai-question',
+          content: value
+        }).then(res => {
+          if (fetchId !== this.lastFetchId) {
+            return
+          }
+          if (res != null && Array.isArray(res)) {
+            // 提取 json 中的 question， 并去重
+            this.dataSourceResults = res.map(item => JSON.parse(item.f_json).question)
+              .filter((item, index, arr) => arr.indexOf(item) === index)
+              .map(item => ({ category: item }))
+            console.warn(this.dataSourceResults)
+          }
+        }).finally(() => {
+          this.searching = false
+        })
       }
     },
     // 处理搜索操作
@@ -82,15 +127,6 @@ export default {
       }
     },
     init () {
-      post('/api/af-system/logic/openapi/getCommonData', {
-        type: 'ai-evaluation',
-        content: '11'
-      }).then(res => {
-        // 提取 json 中的 question， 并去重
-        this.dataSource = res.map(item => JSON.parse(item.f_json).question)
-          .filter((item, index, arr) => arr.indexOf(item) === index)
-          .map(item => ({ category: item }))
-      })
       this.searchInput = ''
       this.obj = undefined
       this.favoriteState = false
@@ -143,6 +179,18 @@ export default {
     padding: 4px 80px 4px 40px;
     font-size: 16px;
   }
+  .select {
+    width: 100px;
+    height: 48px;
+    padding-right: 6px;
+    font-size: 16px;
+    text-align: center;
+    :deep(.ant-select-selection-selected-value) {
+      width: 100px;
+      height: 48px;
+      line-height: 48px;
+    }
+  }
 }
 
 </style>

package/src/pages/DynamicStatistics/index.vue

@@ -121,6 +121,15 @@ export default {
         //     age: Math.floor(Math.random() * 100) + 1
         //   }
         // ]
+        // 保存到数据库中
+        post('/api/af-system/logic/openapi/addCommonData', {
+          type: 'ai-question',
+          content: {
+            uuid: uuid,
+            question: value,
+            date: formatDate('now')
+          }
+        })
         if (Array.isArray(res)) {
           this.addTab(uuid, value, res, false)
         } else {

package/src/router/async/router.map.js

@@ -33,8 +33,6 @@ routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
 routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
 // 系统设置
 routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// 查询配置生成工具
-routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage')
 // AMIS示例页面
 routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
 // 数据检索