@veltra/desktop 1.7.11 → 1.7.13

package/src/components/table/node/col.ts

@@ -1,7 +1,26 @@
 import { TreeNode } from '@cat-kit/core'
+import { withUnit } from '@veltra/utils'
 import { isReactive, reactive, shallowReactive } from 'vue'
 
-import type { TableColumn, TableColumnAlign } from '../../../types'
+import type { TableColumn, TableColumnAlign, TableColumnStyle } from '../../../types'
+
+function normalizeColumnStyle(style?: TableColumnStyle): Record<string, string> | undefined {
+  if (!style) return undefined
+
+  const result: Record<string, string> = {}
+
+  if (style.color !== undefined) {
+    result.color = style.color
+  }
+  if (style.fontSize !== undefined) {
+    const fontSize = withUnit(style.fontSize, 'px')
+    if (fontSize !== undefined) {
+      result.fontSize = fontSize
+    }
+  }
+
+  return Object.keys(result).length ? result : undefined
+}
 
 export class ColumnNode extends TreeNode<TableColumn, ColumnNode> {
   declare children?: ColumnNode[] | undefined
@@ -44,6 +63,16 @@ export class ColumnNode extends TreeNode<TableColumn, ColumnNode> {
     this.data.headerAlign = val
   }
 
+  /** 表体/表尾单元格样式 */
+  get cellStyle(): Record<string, string> | undefined {
+    return normalizeColumnStyle(this.data.style)
+  }
+
+  /** 表头单元格样式 */
+  get headerCellStyle(): Record<string, string> | undefined {
+    return normalizeColumnStyle(this.data.headerStyle ?? this.data.style)
+  }
+
   /** 宽度 */
   get width(): number | undefined {
     const width = this.data.width ?? this.derived.allocatedWidth

package/src/components/table/table-cell.vue

@@ -24,13 +24,18 @@ defineOptions({ name: 'UTableCell' })
  * 父组件 `TableRow` 已经持有注入上下文，直接把 `cellClass` 传下来即可；
  * 这里变成「完全受控」的纯渲染单元。
  */
-const { left, right } = defineProps<{
+const { left, right, cellStyle } = defineProps<{
   cellClass: string
   left?: number
   right?: number
+  cellStyle?: Record<string, string>
   rowspan?: number
   colspan?: number
 }>()
 
-const style = computed(() => ({ left: withUnit(left, 'px'), right: withUnit(right, 'px') }))
+const style = computed(() => ({
+  ...cellStyle,
+  left: withUnit(left, 'px'),
+  right: withUnit(right, 'px')
+}))
 </script>

package/src/components/table/table-foot.vue

@@ -5,6 +5,7 @@
         v-if="leafColumns[0]"
         :class="getCellClass(leafColumns[0])"
         :style="{
+          ...leafColumns[0].cellStyle,
           right: withUnit(leafColumns[0].style.right, 'px'),
           left: withUnit(leafColumns[0].style.left, 'px')
         }"
@@ -16,6 +17,7 @@
         :class="getCellClass(column)"
         :key="column.key"
         :style="{
+          ...column.cellStyle,
           right: withUnit(column.style.right, 'px'),
           left: withUnit(column.style.left, 'px')
         }"

package/src/components/table/table-head.tsx

@@ -26,6 +26,7 @@ const TableHead: DefineComponent = defineComponent({
                 colspan={column.leafs}
                 rowspan={column.children?.length ? undefined : headers.value.length - headerIndex}
                 style={{
+                  ...column.headerCellStyle,
                   left: withUnit(column.style.left, 'px'),
                   right: withUnit(column.style.right, 'px')
                 }}

package/src/components/table/table-row.tsx

@@ -99,6 +99,7 @@ export const UTableRow: DefineComponent<{ row: ITableRow; index: number }> = def
               cellClass={getCellClass(_expandColumn)}
               left={_expandColumn.style.left}
               right={_expandColumn.style.right}
+              cellStyle={_expandColumn.cellStyle}
               key={row.uid + _expandColumn.key}
               {...tableProps.mergeCell?.(expandCtx)}
             >
@@ -156,6 +157,7 @@ export const UTableRow: DefineComponent<{ row: ITableRow; index: number }> = def
                 cellClass={getCellClass(column)}
                 left={column.style.left}
                 right={column.style.right}
+                cellStyle={column.cellStyle}
                 key={row.uid + column.key}
                 // @ts-ignore
                 onClick={(e) => handleCellClick(row, column, e)}

package/src/types/batch-edit.ts

@@ -115,8 +115,6 @@ export interface BatchEditProps extends TableProps {
 
 /** 批量编辑组件定义的事件 */
 export interface BatchEditEmits extends TableEmits {
-  /** 表单控件 change，透传自 UForm */
-  (e: 'field:change', field: string, ...args: any[]): void
   /** 更新数据 */
   (e: 'update:data', value: Record<string, any>[]): void
   /** 点击底部「新增一行」 */

package/src/types/form.ts

@@ -29,8 +29,6 @@ export interface FormProps extends ComponentProps {
 }
 
 export interface FormEmits {
-  /** 控件 change 事件，仅用户操作触发 */
-  (e: 'field:change', field: string, ...args: any[]): void
   /** model 字段值更新，含编程写入 */
   (e: 'field:update', field: string, value: any): void
 }

package/src/types/table.ts

@@ -4,6 +4,11 @@ import type { ShallowRef, Slots, VNode } from 'vue'
 
 export type TableColumnAlign = 'left' | 'center' | 'right'
 
+export interface TableColumnStyle {
+  color?: string
+  fontSize?: number | string
+}
+
 /**
  * 合计上下文
  */
@@ -46,6 +51,10 @@ export interface TableColumn {
    * @default 'left'
    */
   align?: TableColumnAlign
+  /** 表体/表尾单元格样式 */
+  style?: TableColumnStyle
+  /** 表头单元格样式，未指定时取 style */
+  headerStyle?: TableColumnStyle
   /** 列渲染 */
   render?: (scope: TableColumnRenderContext) => RenderReturn
   /** 子列 */
@@ -164,6 +173,9 @@ export interface TableColumnNode extends TreeNode<TableColumn> {
   key: string
   name: string
   align: TableColumnAlign
+  headerAlign: TableColumnAlign
+  cellStyle?: Record<string, string>
+  headerCellStyle?: Record<string, string>
   width: number | undefined
   minWidth: number | undefined
   fixed: 'left' | 'right' | undefined