vue2-client 1.22.6 → 1.22.7

package/src/base-client/components/his/XList/XList.vue

@@ -134,8 +134,8 @@
             @mouseenter="handleGroupMouseEnter(getGroupItemIndex(gIdx, index))"
             @mouseleave="handleMouseLeave"
             :class="{
-              'hover-active': hoveredIndex === getGroupItemIndex(gIdx, index),
-              'selected-active': enableSelectRow && currentSelectedIndex === getGroupItemIndex(gIdx, index)
+              'hover-active': !isEditingIndex(getGroupItemIndex(gIdx, index)) && hoveredIndex === getGroupItemIndex(gIdx, index),
+              'selected-active': !isEditingIndex(getGroupItemIndex(gIdx, index)) && enableSelectRow && currentSelectedIndex === getGroupItemIndex(gIdx, index)
             }"
           >
             <span
@@ -143,7 +143,19 @@
               :class="{ 'text-truncated': hoveredIndex === getGroupItemIndex(gIdx, index) }"
               :style="getTextStyle(getGroupItemIndex(gIdx, index))"
             >
-              <template v-if="showNumber">{{ getGroupItemIndex(gIdx, index) + 1 }}. </template>{{ item.label }}
+              <template v-if="showNumber">{{ getGroupItemIndex(gIdx, index) + 1 }}. </template>
+              <template v-if="editingIndex === getGroupItemIndex(gIdx, index)">
+                <a-input
+                  :value="editingValue"
+                  size="small"
+                  @input="editingValue = $event.target.value"
+                  @blur="finishEditing(getGroupItemIndex(gIdx, index))"
+                  @keyup.enter="$event.target.blur()"
+                />
+              </template>
+              <template v-else>
+                {{ item.label }}
+              </template>
             </span>
 
             <div v-if="button" class="button-group">
@@ -170,8 +182,12 @@
                     class="group-more-icon"
                     @click.stop="handleGroupIconClick(getGroupItemIndex(gIdx, index), $event)"
                   />
-                  <a-menu slot="overlay" @click="({ key }) => handleGroupIconSelect(getGroupItemIndex(gIdx, index), key)">
-                    <a-menu-item v-for="opt in effectiveIconSelect" :key="opt.value">
+                  <a-menu slot="overlay">
+                    <a-menu-item
+                      v-for="opt in effectiveIconSelect"
+                      :key="opt.value"
+                      @click="handleGroupIconSelect(getGroupItemIndex(gIdx, index), opt)"
+                    >
                       {{ opt.label }}
                     </a-menu-item>
                   </a-menu>
@@ -291,10 +307,10 @@ export default {
       type: String,
       default: 'af-his'
     },
-    // 点击是否触发选中（默认不通过点击选中，仅手动控制）
+    // 点击是否触发选中（默认点击即选中）
     selectOnClick: {
       type: Boolean,
-      default: false
+      default: true
     },
     // 受控选中索引；不传则内部维护
     selectedIndex: {
@@ -384,6 +400,9 @@ export default {
       groupIconDropdownVisible: false,
       activeGroupIconIndex: -1,
       iconSelect: [], // 图标下拉选项列表
+      editingIndex: -1,
+      editingValue: '',
+      currentEditingOption: null
     }
   },
   inject: ['getComponentByName'],
@@ -505,8 +524,10 @@ export default {
           this.busy = true
           this.loading = true
           this.nowPage = this.nowPage + this.pageSize
-          this.fixedQueryForm.condition = `Limit ${this.nowPage}, ${this.pageSize}`
-          runLogic(this.logicName, this.fixedQueryForm, 'af-his')
+          const queryForm = Object.assign({}, this.fixedQueryForm, {
+            condition: `Limit ${this.nowPage}, ${this.pageSize}`
+          })
+          runLogic(this.logicName, queryForm, 'af-his')
             .then(async res => {
               this.localData = [...this.localData, ...res]
               if (res.length < this.pageSize) {
@@ -752,6 +773,8 @@ export default {
       this.setSelectedIndex(-1)
     },
     refreshList(param) {
+      this.nowPage = 0
+      this.allLoaded = false
       this.getData(this.queryParamsName, param)
     },
     /**
@@ -808,19 +831,37 @@ export default {
     setSelectedById(id, field = 'id') {
       const list = this.listMode ? this.localData : this.data
       if (!Array.isArray(list)) return
-      const index = list.findIndex(item => {
-        if (Array.isArray(item)) {
-          const f = item.find(d => d && d.label === field)
-          return f && f.value === id
+      if (this.listMode) {
+        for (let gIdx = 0; gIdx < list.length; gIdx++) {
+          const row = list[gIdx]
+          if (!Array.isArray(row.titlelist)) continue
+          const innerIndex = row.titlelist.findIndex(item => item && item[field] === id)
+          if (innerIndex >= 0) {
+            this.setSelectedIndex(this.getGroupItemIndex(gIdx, innerIndex))
+            return
+          }
         }
-        return item && item[field] === id
-      })
+        return
+      }
+      const index = list.findIndex(item => item && item[field] === id)
       if (index >= 0) this.setSelectedIndex(index)
     },
     // 根据 label/value（卡片数组数据场景）匹配选中
     setSelectedByLabelValue(label, value) {
       const list = this.listMode ? this.localData : this.data
       if (!Array.isArray(list)) return
+      if (this.listMode) {
+        for (let gIdx = 0; gIdx < list.length; gIdx++) {
+          const row = list[gIdx]
+          if (!Array.isArray(row.titlelist)) continue
+          const innerIndex = row.titlelist.findIndex(item => item && item.label === label && item.value === value)
+          if (innerIndex >= 0) {
+            this.setSelectedIndex(this.getGroupItemIndex(gIdx, innerIndex))
+            return
+          }
+        }
+        return
+      }
       const index = list.findIndex(
         item => Array.isArray(item) && item.some(d => d && d.label === label && d.value === value)
       )
@@ -896,7 +937,74 @@ export default {
     handleGroupIconSelect(index, opt) {
       this.groupIconDropdownVisible = false
       this.activeGroupIconIndex = -1
-      this.$emit('groupIconSelect', { index, option: opt })
+      try {
+        const opts = Array.isArray(this.effectiveIconSelect) ? this.effectiveIconSelect : []
+        console.log('[XList] effectiveIconSelect=', JSON.stringify(opts), 'click opt=', JSON.stringify(opt))
+      } catch (e) {}
+      const action = (opt && opt.action) ? String(opt.action).trim().toLowerCase() : ''
+      const isEdit = action === 'edit' || action === 'rename'
+      if (isEdit) {
+        this.editingIndex = index
+        this.editingValue = this.getEditingValue(index)
+        this.currentEditingOption = opt
+        this.$nextTick(() => {
+          const el = this.$el.querySelector('.editing-input')
+          if (el) el.focus()
+        })
+        return
+      }
+      const eventName = opt && typeof opt.event === 'string' ? opt.event : 'groupIconSelect'
+      const data = this.getLocalItemByIndex(index)
+      this.$emit(eventName, { index, option: opt, data })
+    },
+    // 获取当前编辑项的初始文本
+    getEditingValue(index) {
+      const globalIndex = index
+      const item = this.getLocalItemByIndex(globalIndex)
+      return item ? String(item.label || '') : ''
+    },
+    isEditingIndex(index) {
+      return index === this.editingIndex
+    },
+    // 根据全局索引获取当前本地数据项
+    getLocalItemByIndex(globalIndex) {
+      if (!Array.isArray(this.localData)) return null
+      for (const row of this.localData) {
+        const list = Array.isArray(row.titlelist) ? row.titlelist : []
+        if (globalIndex < list.length) {
+          return list[globalIndex]
+        }
+        globalIndex -= list.length
+      }
+      return null
+    },
+    // 编辑完成
+    finishEditing(index) {
+      const trimmed = (this.editingValue || '').trim()
+      const option = this.currentEditingOption
+      this.editingIndex = -1
+      this.editingValue = ''
+      this.currentEditingOption = null
+      if (trimmed) {
+        this.updateLocalItemLabel(index, trimmed)
+      }
+      const data = this.getLocalItemByIndex(index)
+      const eventName = option && typeof option.event === 'string' ? option.event : 'groupIconSelect'
+      this.$emit(eventName, { index, option, label: trimmed, data })
+    },
+    // 更新本地数据 label
+    updateLocalItemLabel(index, label) {
+      const cloned = JSON.parse(JSON.stringify(this.localData || []))
+      let current = index
+      for (const row of cloned) {
+        const list = Array.isArray(row.titlelist) ? row.titlelist : []
+        if (current < list.length) {
+          list[current].label = label
+          break
+        }
+        current -= list.length
+      }
+      this.localData = cloned
     },
     // 清除所有定时器
     clearAllTimers() {
@@ -911,7 +1019,8 @@ export default {
     },
     // 选项框点击
     handleOptionClick(index, action) {
-      this.$emit('optionClick', { data: this.data[index], action })
+      const data = this.getLocalItemByIndex(index)
+      this.$emit('optionClick', { data, action })
     },
     // 获取文本样式（简化版本，主要依赖CSS类控制）
     getTextStyle(index) {
@@ -1322,6 +1431,10 @@ export default {
 
 /* 分组模式样式（enableGroupStyle） */
 .x-list-enableGroupStyle {
+  &.x-list-wrapper.list-wrapper {
+    height: 100%;
+    max-height: none !important;
+  }
   .x-list-group {
     margin-bottom: 12px;
   }