From 9cff7511eefadf1186ec288d7bf4ee7e1e2170d8 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Wed, 10 Jan 2024 15:20:37 +0500 Subject: [PATCH 01/10] added repo check + version check with published packages --- .github/workflows/publish-lowcoder-cli.yml | 5 ++++- .github/workflows/publish-lowcoder-comps.yml | 5 ++++- .github/workflows/publish-lowcoder-core.yml | 5 ++++- .github/workflows/publish-lowcoder-sdk.yml | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-lowcoder-cli.yml b/.github/workflows/publish-lowcoder-cli.yml index 17eafa909..18f9a4965 100644 --- a/.github/workflows/publish-lowcoder-cli.yml +++ b/.github/workflows/publish-lowcoder-cli.yml @@ -5,10 +5,11 @@ name: Publish Lowcoder CLI on: push: - branches: [ "dev" ] + branches: [ "worflows-updates" ] jobs: publish-package: + if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} runs-on: ubuntu-latest steps: - name: Checkout repository @@ -19,7 +20,9 @@ jobs: id: check with: diff-search: true + static-checking: localIsNew file-name: client/packages/lowcoder-cli/package.json + file-url: https://unpkg.com/lowcoder-cli@latest/package.json - name: Version update detected if: steps.check.outputs.changed == 'true' diff --git a/.github/workflows/publish-lowcoder-comps.yml b/.github/workflows/publish-lowcoder-comps.yml index 40eb567e0..ba3ea3302 100644 --- a/.github/workflows/publish-lowcoder-comps.yml +++ b/.github/workflows/publish-lowcoder-comps.yml @@ -5,10 +5,11 @@ name: Publish Lowcoder Comps on: push: - branches: [ "dev" ] + branches: [ "worflows-updates" ] jobs: publish-package: + if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} runs-on: ubuntu-latest steps: - name: Checkout repository @@ -19,7 +20,9 @@ jobs: id: check with: diff-search: true + static-checking: localIsNew file-name: client/packages/lowcoder-comps/package.json + file-url: https://unpkg.com/lowcoder-comps@latest/package.json - name: Version update detected if: steps.check.outputs.changed == 'true' diff --git a/.github/workflows/publish-lowcoder-core.yml b/.github/workflows/publish-lowcoder-core.yml index 5d36c46c7..587eed2d9 100644 --- a/.github/workflows/publish-lowcoder-core.yml +++ b/.github/workflows/publish-lowcoder-core.yml @@ -5,10 +5,11 @@ name: Publish Lowcoder Core on: push: - branches: [ "dev" ] + branches: [ "worflows-updates" ] jobs: publish-package: + if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} runs-on: ubuntu-latest steps: - name: Checkout repository @@ -19,7 +20,9 @@ jobs: id: check with: diff-search: true + static-checking: localIsNew file-name: client/packages/lowcoder-core/package.json + file-url: https://unpkg.com/lowcoder-core@latest/package.json - name: Version update detected if: steps.check.outputs.changed == 'true' diff --git a/.github/workflows/publish-lowcoder-sdk.yml b/.github/workflows/publish-lowcoder-sdk.yml index 40d93e71a..546cc5fb0 100644 --- a/.github/workflows/publish-lowcoder-sdk.yml +++ b/.github/workflows/publish-lowcoder-sdk.yml @@ -5,10 +5,11 @@ name: Publish Lowcoder SDK on: push: - branches: [ "dev" ] + branches: [ "worflows-updates" ] jobs: publish-package: + if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} runs-on: ubuntu-latest steps: - name: Checkout repository @@ -19,7 +20,9 @@ jobs: id: check with: diff-search: true + static-checking: localIsNew file-name: client/packages/lowcoder-sdk/package.json + file-url: https://unpkg.com/lowcoder-sdk@latest/package.json - name: Version update detected if: steps.check.outputs.changed == 'true' From 701321d88ceb64b51c5dceed28c9e7e5edf9330a Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Wed, 10 Jan 2024 15:23:34 +0500 Subject: [PATCH 02/10] testing worflows --- .github/workflows/publish-lowcoder-sdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-lowcoder-sdk.yml b/.github/workflows/publish-lowcoder-sdk.yml index 546cc5fb0..89130a22d 100644 --- a/.github/workflows/publish-lowcoder-sdk.yml +++ b/.github/workflows/publish-lowcoder-sdk.yml @@ -9,7 +9,7 @@ on: jobs: publish-package: - if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} + if: ${{ github.repositoryUrl == 'git@github.com:raheeliftikhar5/lowcoder.git' }} runs-on: ubuntu-latest steps: - name: Checkout repository From a740ab44f5d6cc767509209c3b7c92fa22a2f5ed Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Wed, 10 Jan 2024 15:31:18 +0500 Subject: [PATCH 03/10] testing workflows --- .github/workflows/publish-lowcoder-sdk.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-lowcoder-sdk.yml b/.github/workflows/publish-lowcoder-sdk.yml index 89130a22d..4cc661885 100644 --- a/.github/workflows/publish-lowcoder-sdk.yml +++ b/.github/workflows/publish-lowcoder-sdk.yml @@ -9,12 +9,14 @@ on: jobs: publish-package: - if: ${{ github.repositoryUrl == 'git@github.com:raheeliftikhar5/lowcoder.git' }} runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Hello + run: 'echo "${{ github }}"' + - name: Check version changes uses: EndBug/version-check@v1 id: check From 46a61d0daff35c2e86346473e776da7f0600ef67 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Wed, 10 Jan 2024 15:32:40 +0500 Subject: [PATCH 04/10] testing workflows --- .github/workflows/publish-lowcoder-sdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-lowcoder-sdk.yml b/.github/workflows/publish-lowcoder-sdk.yml index 4cc661885..5ea71fa23 100644 --- a/.github/workflows/publish-lowcoder-sdk.yml +++ b/.github/workflows/publish-lowcoder-sdk.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v3 - name: Hello - run: 'echo "${{ github }}"' + run: 'echo "${{ github.repositoryUrl }}"' - name: Check version changes uses: EndBug/version-check@v1 From d769c750928f448ce3a26fe26671b6a9838b8500 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Wed, 10 Jan 2024 15:34:28 +0500 Subject: [PATCH 05/10] testing workflows --- .github/workflows/publish-lowcoder-sdk.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/publish-lowcoder-sdk.yml b/.github/workflows/publish-lowcoder-sdk.yml index 5ea71fa23..23121648a 100644 --- a/.github/workflows/publish-lowcoder-sdk.yml +++ b/.github/workflows/publish-lowcoder-sdk.yml @@ -9,14 +9,12 @@ on: jobs: publish-package: + if: ${{ github.repositoryUrl == 'git://github.com/raheeliftikhar5/lowcoder.git' }} runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Hello - run: 'echo "${{ github.repositoryUrl }}"' - - name: Check version changes uses: EndBug/version-check@v1 id: check From f18b34dc7d1d6b875d9d42df3408029cf7998f3c Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Wed, 10 Jan 2024 15:42:59 +0500 Subject: [PATCH 06/10] testing workflows --- .github/workflows/publish-lowcoder-sdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-lowcoder-sdk.yml b/.github/workflows/publish-lowcoder-sdk.yml index 23121648a..3301c5c66 100644 --- a/.github/workflows/publish-lowcoder-sdk.yml +++ b/.github/workflows/publish-lowcoder-sdk.yml @@ -9,7 +9,7 @@ on: jobs: publish-package: - if: ${{ github.repositoryUrl == 'git://github.com/raheeliftikhar5/lowcoder.git' }} + if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}} runs-on: ubuntu-latest steps: - name: Checkout repository From dcffcbea79d61ca1d2db57b01723210a5f42f168 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Wed, 10 Jan 2024 16:23:05 +0500 Subject: [PATCH 07/10] workflow updates --- .github/workflows/publish-lowcoder-cli.yml | 4 ++-- .github/workflows/publish-lowcoder-comps.yml | 4 ++-- .github/workflows/publish-lowcoder-core.yml | 4 ++-- .github/workflows/publish-lowcoder-sdk.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-lowcoder-cli.yml b/.github/workflows/publish-lowcoder-cli.yml index 18f9a4965..2aadbe488 100644 --- a/.github/workflows/publish-lowcoder-cli.yml +++ b/.github/workflows/publish-lowcoder-cli.yml @@ -5,11 +5,11 @@ name: Publish Lowcoder CLI on: push: - branches: [ "worflows-updates" ] + branches: [ "dev" ] jobs: publish-package: - if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} + if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}} runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/.github/workflows/publish-lowcoder-comps.yml b/.github/workflows/publish-lowcoder-comps.yml index ba3ea3302..27ffb60f9 100644 --- a/.github/workflows/publish-lowcoder-comps.yml +++ b/.github/workflows/publish-lowcoder-comps.yml @@ -5,11 +5,11 @@ name: Publish Lowcoder Comps on: push: - branches: [ "worflows-updates" ] + branches: [ "dev" ] jobs: publish-package: - if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} + if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}} runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/.github/workflows/publish-lowcoder-core.yml b/.github/workflows/publish-lowcoder-core.yml index 587eed2d9..34222ad56 100644 --- a/.github/workflows/publish-lowcoder-core.yml +++ b/.github/workflows/publish-lowcoder-core.yml @@ -5,11 +5,11 @@ name: Publish Lowcoder Core on: push: - branches: [ "worflows-updates" ] + branches: [ "dev" ] jobs: publish-package: - if: ${{ github.repositoryUrl == 'git@github.com:lowcoder-org/lowcoder.git' }} + if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}} runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/.github/workflows/publish-lowcoder-sdk.yml b/.github/workflows/publish-lowcoder-sdk.yml index 3301c5c66..d9385b7d9 100644 --- a/.github/workflows/publish-lowcoder-sdk.yml +++ b/.github/workflows/publish-lowcoder-sdk.yml @@ -5,7 +5,7 @@ name: Publish Lowcoder SDK on: push: - branches: [ "worflows-updates" ] + branches: [ "dev" ] jobs: publish-package: From 86d0f29d47669251bbad041b21c0ad72c7e37951 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Thu, 11 Jan 2024 21:33:12 +0500 Subject: [PATCH 08/10] fix column disappear on resize --- .../src/comps/comps/tableComp/tableCompView.tsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx index a523e7c58..8ac23651d 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx @@ -553,11 +553,6 @@ function ResizeableTable(props: CustomTableProps(props: CustomTableProps { - // if (width) { - // setResizeData({ - // index: index, - // width: width, - // }); - // } - // }, onResize: (width: React.SyntheticEvent) => { if (width) { setResizeData({ From cc9af452648ad38a086a23aa72f5b210d8006643 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Thu, 11 Jan 2024 21:33:56 +0500 Subject: [PATCH 09/10] remove double shadow from table toolbar popups --- .../lowcoder/src/comps/comps/tableComp/tableToolbarComp.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableToolbarComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableToolbarComp.tsx index f7e8829e0..3509ce4af 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/tableToolbarComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/tableToolbarComp.tsx @@ -609,7 +609,7 @@ function ColumnSetting(props: { allChecked = false; } return ( - + { @@ -677,6 +677,7 @@ function ToolbarPopover(props: { Date: Thu, 11 Jan 2024 21:34:46 +0500 Subject: [PATCH 10/10] show/hide column title in table --- .../comps/tableComp/column/tableColumnComp.tsx | 15 ++++++++++++++- .../tableComp/column/tableColumnListComp.tsx | 1 - .../src/comps/comps/tableComp/tableUtils.tsx | 2 +- client/packages/lowcoder/src/i18n/locales/de.ts | 4 +++- client/packages/lowcoder/src/i18n/locales/en.ts | 2 ++ client/packages/lowcoder/src/i18n/locales/zh.ts | 2 ++ 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx index 348ce73fa..8bf84e276 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx @@ -27,7 +27,6 @@ import { ColorControl } from "comps/controls/colorControl"; import { JSONValue } from "util/jsonTypes"; import styled from "styled-components"; import { TextOverflowControl } from "comps/controls/textOverflowControl"; -import { TableColumnLinkStyle, styleControl } from "@lowcoder-ee/index.sdk"; import { default as Divider } from "antd/es/divider"; export type Render = ReturnType["getOriginalComp"]>; export const RenderComp = withSelectedMultiContext(ColumnTypeComp); @@ -86,6 +85,7 @@ export type CellColorViewType = (param: { export const columnChildrenMap = { // column title title: StringControl, + showTitle: withDefault(BoolControl, true), // a custom column or a data column isCustom: valueComp(false), // If it is a data column, it must be the name of the column and cannot be duplicated as a react key @@ -149,6 +149,13 @@ export class ColumnComp extends ColumnInitComp { ) ); } + if(action.type === CompActionTypes.CHANGE_VALUE) { + const title = comp.children.title.unevaledValue; + const dataIndex = comp.children.dataIndex.getView(); + if(!Boolean(title)) { + comp.children.title.dispatchChangeValueAction(dataIndex); + } + } return comp; } @@ -180,9 +187,14 @@ export class ColumnComp extends ColumnInitComp { <> {this.children.title.propertyView({ label: trans("table.columnTitle"), + placeholder: this.children.dataIndex.getView(), })} {/* FIXME: cast type currently, return type of withContext should be corrected later */} {this.children.render.getPropertyView()} + {this.children.showTitle.propertyView({ + label: trans("table.showTitle"), + tooltip: trans("table.showTitleTooltip"), + })} {ColumnTypeCompMap[columnType].canBeEditable() && this.children.editable.propertyView({ label: trans("table.editable") })} {this.children.sortable.propertyView({ @@ -311,6 +323,7 @@ export function newPrimaryColumn( title?: string, isTag?: boolean ): ConstructorToDataType { + console.log('newPrimaryColumn', title); return { title: title ?? key, dataIndex: key, diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnListComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnListComp.tsx index f5429ba5c..d186aad0a 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnListComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnListComp.tsx @@ -101,7 +101,6 @@ export class ColumnListComp extends ColumnListTmpComp { dynamicColumn: boolean; data: Array; }) { - console.log("dataChangedAction", param); return customAction( { type: "dataChanged", diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx index 5e30837e3..c3c6a3fa1 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx @@ -311,7 +311,7 @@ export function columnsToAntdFormat( }[]; const title = renderTitle({ title: column.title, editable: column.editable }); return { - title: title, + title: column.showTitle ? title : '', titleText: column.title, dataIndex: column.dataIndex, align: column.align, diff --git a/client/packages/lowcoder/src/i18n/locales/de.ts b/client/packages/lowcoder/src/i18n/locales/de.ts index e049fb2f0..bc5cd9101 100644 --- a/client/packages/lowcoder/src/i18n/locales/de.ts +++ b/client/packages/lowcoder/src/i18n/locales/de.ts @@ -1124,7 +1124,9 @@ export const de = { "columnValueTooltip": "\\'{{currentCell}}\\': Aktuelle Zelldaten\n \\'{{currentRow}}\\': Aktuelle Zeilendaten\n \\'{{currentIndex}}\\': Aktueller Datenindex (beginnend bei 0)\n Beispiel: \\'{{currentCell * 5}}\\' Show 5 Times the Original Value Data.", "imageSrc": "Bildquelle", "imageSize": "Bildgröße", - "columnTitle": "Titel", + "columnTitle": "Titel anzeigen", + "showTitle": "Show Title", + "showTitleTooltip": "Spaltentitel im Tabellenkopf ein-/ausblenden", "sortable": "Sortierbar", "align": "Ausrichtung", "fixedColumn": "Feste Säule", diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts index a75348a04..ef8d3d165 100644 --- a/client/packages/lowcoder/src/i18n/locales/en.ts +++ b/client/packages/lowcoder/src/i18n/locales/en.ts @@ -1229,6 +1229,8 @@ export const en = { "imageSrc": "Image Source", "imageSize": "Image Size", "columnTitle": "Title", + "showTitle": "Show Title", + "showTitleTooltip": "Show/Hide column title in table header", "sortable": "Sortable", "align": "Alignment", "fixedColumn": "Fixed Column", diff --git a/client/packages/lowcoder/src/i18n/locales/zh.ts b/client/packages/lowcoder/src/i18n/locales/zh.ts index 778a08885..fe235979e 100644 --- a/client/packages/lowcoder/src/i18n/locales/zh.ts +++ b/client/packages/lowcoder/src/i18n/locales/zh.ts @@ -1200,6 +1200,8 @@ table: { imageSrc: "图片链接", imageSize: "图片尺寸", columnTitle: "标题", + showTitle: "显示标题", + showTitleTooltip: "显示/隐藏表标题中的列标题", sortable: "可排序", align: "对齐方式", fixedColumn: "固定列",