@veltra/desktop 1.1.4 → 1.1.6

package/src/components/table/style.scss

@@ -17,8 +17,8 @@ $root-name: table;
   width: 100%;
   position: relative;
   border: 1px solid var(--u-table-border-color);
-  border-bottom: none;
   overflow: hidden;
+  background-color: fn.use-var(bg-color, top);
 
   @include m.size using ($size) {
     border-radius: fn.use-var(radius, $size);
@@ -171,6 +171,14 @@ $root-name: table;
 
   @include m.e(body) {
     will-change: transform;
+
+    @include m.bem($root-name, row) {
+      &:last-child {
+        @include m.bem($root-name, cell) {
+          border-bottom: none;
+        }
+      }
+    }
   }
 
   @include m.e(empty) {

package/src/components/table/table.vue

@@ -151,9 +151,7 @@ const columnConfig = useColumns({
 
 const { leafColumns } = columnConfig
 
-const { handleScroll, leftFixed, rightFixed } = useFixedColumns({
-  isScrolling: isScrollingRelay
-})
+const { handleScroll, leftFixed, rightFixed } = useFixedColumns()
 
 const {
   getColumnSlotsNode,

package/src/components/table/use-fixed-columns.ts

@@ -1,5 +1,5 @@
 import { debounce } from '@cat-kit/core'
-import { type ShallowRef, type Ref, ref, watch } from 'vue'
+import { type ShallowRef, ref } from 'vue'
 
 import type { ScrollPosition } from '../../types'
 
@@ -9,62 +9,18 @@ interface UseColumnFixedReturned {
   handleScroll: (e: Required<ScrollPosition>) => void
 }
 
-interface Options {
-  /**
-   * D1：滚动中 (`true`) 暂缓 `leftFixed` / `rightFixed` 的切换，滚动结束后
-   * 一次性补算。
-   *
-   * 背景：固定列的阴影是通过在 cell 上切换 `is-last-fixed` / `is-first-fixed`
-   * 等 class 实现的，这些 class 会穿透到 `useTable.getCellClass` 的缓存键，
-   * 任何一次切换都会让全表的单元格类名失效重算。滚动本身并不需要实时更新阴影，
-   * 因此把切换推迟到 `isScrolling` 归零时做一次即可。
-   *
-   * 未传入时退化到旧行为（实时切换）。
-   */
-  isScrolling?: Ref<boolean>
-}
-
-/**
- * 固定列
- * @returns
- */
-export function useFixedColumns(options: Options = {}): UseColumnFixedReturned {
-  const { isScrolling } = options
-
+export function useFixedColumns(): UseColumnFixedReturned {
   const leftFixed = ref(false)
   const rightFixed = ref(false)
 
-  let pendingLeft: boolean | null = null
-  let pendingRight: boolean | null = null
-
-  const applyImmediate = (nextLeft: boolean, nextRight: boolean): void => {
-    if (nextLeft !== leftFixed.value) leftFixed.value = nextLeft
-    if (nextRight !== rightFixed.value) rightFixed.value = nextRight
-    pendingLeft = null
-    pendingRight = null
-  }
-
   const handleScroll = debounce((e: Required<ScrollPosition>) => {
     const nextLeft = e.x > 0
     // 精度修正：浏览器滚动条最后 1px 的误差
     const nextRight = !(e.cw + e.x + 1 >= e.sw)
 
-    if (isScrolling?.value) {
-      pendingLeft = nextLeft
-      pendingRight = nextRight
-      return
-    }
-
-    applyImmediate(nextLeft, nextRight)
-  }, 50)
-
-  if (isScrolling) {
-    watch(isScrolling, (v) => {
-      if (v) return
-      if (pendingLeft === null && pendingRight === null) return
-      applyImmediate(pendingLeft ?? leftFixed.value, pendingRight ?? rightFixed.value)
-    })
-  }
+    if (nextLeft !== leftFixed.value) leftFixed.value = nextLeft
+    if (nextRight !== rightFixed.value) rightFixed.value = nextRight
+  }, 100)
 
   return { leftFixed, rightFixed, handleScroll }
 }

package/src/style.ts

@@ -32,6 +32,7 @@ import './components/grid-input/style'
 import './components/grid/style'
 import './components/group-input/style'
 import './components/icon/style'
+import './components/kbd/style'
 import './components/input/style'
 import './components/layout/style'
 import './components/list/style'

package/src/types/action.ts

@@ -30,17 +30,6 @@ export interface ActionGroupProps {
    */
   max?: number
 
-  /**
-   * 紧凑悬浮模式
-   *
-   * @description
-   * - 默认半透明，悬浮在父容器上方时完全显现
-   * - 提供圆角胶囊容器与磨砂背景，更适合表格行内操作栏
-   * - "更多"按钮也会切换为图标态以与其他操作按钮保持一致
-   * @default false
-   */
-  hover?: boolean
-
   /**
    * 子项默认尺寸
    * @default 'small'
@@ -68,5 +57,11 @@ export interface ActionEmits {
 /** 操作组件暴露的属性和方法(组件内部使用) */
 export interface _ActionExposed {}
 
+export interface _ActionGroupExposed {
+  closeTip: () => void
+}
+
 /** 操作组件暴露的属性和方法(组件外部使用, 引用的值会被自动解构) */
 export type ActionExposed = DeconstructValue<_ActionExposed>
+
+export type ActionGroupExposed = DeconstructValue<_ActionGroupExposed>

package/src/types/condition-editor.ts

@@ -1,17 +1,49 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { ComponentSize, DeconstructValue } from '@veltra/utils'
+
+import type { VariableItem } from './expression-editor'
+
+export interface ConditionField {
+  label: string
+  value: string
+  type: 'string' | 'number' | 'boolean' | 'date' | 'enum'
+  enumOptions?: { label: string; value: string }[]
+}
+
+export type ConditionValue =
+  | { kind: 'constant'; value: string }
+  | { kind: 'variable'; name: string }
+
+export interface ConditionItem {
+  field: string
+  operator: string
+  value: ConditionValue
+  _result?: boolean
+}
+
+export interface ConditionGroup {
+  logic: 'and' | 'or'
+  conditions: ConditionItem[]
+  groups: ConditionGroup[]
+  _result?: boolean
+}
+
+export type ConditionExpression = ConditionGroup
 
-/** 条件编辑器组件属性 */
 export interface ConditionEditorProps {
-  modelValue?: string
+  modelValue?: ConditionExpression
+  fields?: ConditionField[]
+  variables?: VariableItem[]
+  data?: Record<string, unknown>
+  size?: ComponentSize
+  disabled?: boolean
+  readonly?: boolean
 }
 
-/** 条件编辑器组件定义的事件 */
 export interface ConditionEditorEmits {
-  (e: 'update:modelValue', value: string): void
+  (e: 'update:modelValue', value: ConditionExpression): void
+  (e: 'evaluate', results: ConditionExpression): void
 }
 
-/** 条件编辑器组件暴露的属性和方法(组件内部使用) */
 export interface _ConditionEditorExposed {}
 
-/** 条件编辑器组件暴露的属性和方法(组件外部使用, 引用的值会被自动解构) */
 export type ConditionEditorExposed = DeconstructValue<_ConditionEditorExposed>

package/src/types/table.ts

@@ -127,8 +127,6 @@ export interface TableProps {
   virtualThreshold?: number
   /** 是否开启展开行, 只在非树形模式下有效 */
   expandable?: boolean
-  /** 是否开启虚拟列表 */
-  virtual?: boolean
   /**  默认展开全部 */
   defaultExpandAll?: boolean
   /** 文本溢出省略 */