TableProps add Primary key column show name

ideal-world · Aug 26, 2024 · 63e1c07 · 63e1c07
1 parent f6c0bef
commit 63e1c07
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/components/conf.ts b/src/components/conf.ts
@@ -10,6 +10,7 @@ import * as eb from './eventbus'
 export interface TableConf extends CommonFunctionProps {
   id: string
   pkColumnName: string
+  pkColumnShowName?: string
   parentPkColumnName?: string
   columns: TableColumnProps[]
   styles: TableStyleProps
@@ -44,6 +45,7 @@ export function init(props: SimpleTableProps): {
     id: tableProps.id,
     pkColumnName: tableProps.pkColumnName,
     parentPkColumnName: tableProps.parentPkColumnName,
+    pkColumnShowName: tableProps.pkColumnShowName,
     columns: tableProps.columns,
     styles: tableProps.styles,
     quickSearch: tableProps.quickSearch,

diff --git a/src/components/layout/list/List.vue b/src/components/layout/list/List.vue
@@ -105,6 +105,7 @@ onMounted(() => {
       <RowsComp
         :records="props.layoutConf.data.records"
         :pk-column-name="props.tableConf.pkColumnName"
+        :pk-column-show-name="props.tableConf.pkColumnShowName"
         :parent-pk-column-name="props.tableConf.parentPkColumnName"
         :sub-data-show-kind="props.layoutConf.subDataShowKind"
         :pk-kind-is-number="pkKindIsNumber"

diff --git a/src/components/layout/list/ListRows.vue b/src/components/layout/list/ListRows.vue
@@ -14,6 +14,9 @@ const props = defineProps<{
   // 主键列名
   // Primary key column name
   pkColumnName: string
+  // 主键列显示名
+  // Primary key column show name
+  pkColumnShowName?: string
   // 父主键列名
   // Parent primary key column name
   parentPkColumnName?: string
@@ -78,7 +81,7 @@ const props = defineProps<{
     >
       <div v-if="props.subDataShowKind === SubDataShowKind.FOLD_SUB_DATA && props.parentPkColumnName" class="flex justify-end" :style="{ width: `${15 * (row[NODE_DEPTH_FLAG] + 1)}px` }" v-html="renderTreeToggleHandler(props.records[idx + 1] && row[props.pkColumnName] === props.records[idx + 1][props.parentPkColumnName])" />
       <i v-else-if="props.subDataShowKind === SubDataShowKind.TILE_ALL_DATA && props.parentPkColumnName && row[props.parentPkColumnName]" :class="`${iconSvg.SUB}`" />
-      {{ row[props.pkColumnName] }}
+      {{ row[props.pkColumnShowName || props.pkColumnName] }}
     </div>
     <!-- 常规数据列 -->
     <!-- Normal data column -->
@@ -91,7 +94,7 @@ const props = defineProps<{
       <!-- 优先使用自定义渲染 -->
       <!-- Prefer custom rendering -->
       <div v-if="column.name === 'name'" style="display: none;" class="hover-edit invisible group-hover/item:visible cursor-pointer bg-white h-full flex items-center absolute right-0 top-0 pr-1">
-        <i class="octicon-pencil-24"></i>
+        <i class="octicon-pencil-24" />
       </div>
       <div v-if="column.render" v-html="column.render(row, props.layoutKind)" />
       <template v-else-if="column.dataKind === DataKind.DATE || column.dataKind === DataKind.TIME || column.dataKind === DataKind.DATETIME">

diff --git a/src/props/kernelProps.ts b/src/props/kernelProps.ts
@@ -344,6 +344,12 @@ export interface TableProps extends CommonFunctionProps {
    * After enabling, only the first layout will be displayed, and functions such as filter, group, sort, and table configuration will not be displayed.
    */
   mini: boolean
+  /**
+   * 主键列显示名
+   *
+   * Primary key column show name
+   */
+  pkColumnShowName?: string
 }
 /**
  * 简单表格属性
@@ -545,6 +551,12 @@ export interface SimpleTableProps extends SimpleCommonFunctionProps {
    * After enabling, only the first layout will be displayed, and functions such as filter, group, sort, and table configuration will not be displayed.
    */
   mini?: boolean
+  /**
+   * 主键列显示名
+   *
+   * Primary key column show name
+   */
+  pkColumnShowName?: string
 }
 /**
  * 生成表格属性
@@ -572,6 +584,7 @@ export function generateTableProps(simple: SimpleTableProps): TableProps {
     })),
     styles: generateTableStyleProps(simple.styles ?? {}),
     mini: simple.mini ?? false,
+    pkColumnShowName: simple.pkColumnShowName,
   }
 }