Skip to content

Dev -> Main for 2.2.2 #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a35a815
fix: updated helm chart to reflect all recent changes
ludomikula Jan 7, 2024
085a9d0
Add forwarding of oauth token to node service
aq-ikhwa-tech Jan 8, 2024
07b1484
fix: add COMMON_WORKSPACE_MODE setting to docker-compose files and he…
ludomikula Jan 9, 2024
9cff751
added repo check + version check with published packages
raheeliftikhar5 Jan 10, 2024
701321d
testing worflows
raheeliftikhar5 Jan 10, 2024
a740ab4
testing workflows
raheeliftikhar5 Jan 10, 2024
46a61d0
testing workflows
raheeliftikhar5 Jan 10, 2024
d769c75
testing workflows
raheeliftikhar5 Jan 10, 2024
f18b34d
testing workflows
raheeliftikhar5 Jan 10, 2024
dcffcbe
workflow updates
raheeliftikhar5 Jan 10, 2024
1d71c48
Finalize handling for open api oauth inherit from login workflow
aq-ikhwa-tech Jan 10, 2024
ede2e4e
Merge branch 'dev' into add-oauth-handling-for-open-api-datasources
aq-ikhwa-tech Jan 10, 2024
e1d2094
Update test to fix node run failure
aq-ikhwa-tech Jan 10, 2024
86d0f29
fix column disappear on resize
raheeliftikhar5 Jan 11, 2024
cc9af45
remove double shadow from table toolbar popups
raheeliftikhar5 Jan 11, 2024
5a28671
show/hide column title in table
raheeliftikhar5 Jan 11, 2024
113c768
Merge pull request #624 from lowcoder-org/add-oauth-handling-for-open…
FalkWolsky Jan 11, 2024
9d81d29
Merge branch 'dev' into worflows-updates
FalkWolsky Jan 11, 2024
b20c97f
Merge pull request #626 from raheeliftikhar5/worflows-updates
FalkWolsky Jan 11, 2024
89b1acd
Merge pull request #618 from lowcoder-org/deployment_updates
FalkWolsky Jan 11, 2024
8d485a2
Table Styles update
Jan 11, 2024
4d6f8da
Margins, Header, Borders
Jan 12, 2024
2d76ceb
added step control for number type columns
raheeliftikhar5 Jan 12, 2024
6bd21e7
show links as per space available for table links type columns
raheeliftikhar5 Jan 12, 2024
342c9da
table events added for rowShrink and download
raheeliftikhar5 Jan 12, 2024
05eacdc
table events added for columnEdited and search
raheeliftikhar5 Jan 12, 2024
6fa43f1
added precision for float number columns
raheeliftikhar5 Jan 12, 2024
185b169
Merge pull request #628 from raheeliftikhar5/table-updates
FalkWolsky Jan 13, 2024
683c87e
Margins, Header, Borders 2
Jan 13, 2024
1be2fc5
Resize handles
Jan 14, 2024
f1ced9f
Merge pull request #630 from lowcoder-org/main
FalkWolsky Jan 14, 2024
7371565
Color settings
Jan 14, 2024
c59cf2d
Merge branch 'dev' into feature/table-styling
FalkWolsky Jan 14, 2024
f0db976
Merge pull request #631 from lowcoder-org/feature/table-styling
FalkWolsky Jan 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/publish-lowcoder-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:

jobs:
publish-package:
if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/publish-lowcoder-comps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:

jobs:
publish-package:
if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/publish-lowcoder-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:

jobs:
publish-package:
if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/publish-lowcoder-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:

jobs:
publish-package:
if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export interface CellProps {
candidateTags?: string[];
candidateStatus?: { text: string; status: StatusType }[];
textOverflow?: boolean;
onTableEvent?: (eventName: any) => void;
}

export type CellViewReturn = (props: CellProps) => ReactNode;
Expand Down Expand Up @@ -71,6 +72,7 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
baseValue,
candidateTags,
candidateStatus,
onTableEvent,
} = props;
const status = _.isNil(changeValue) ? "normal" : "toSave";
const editable = editViewFn ? props.editable : false;
Expand All @@ -96,6 +98,9 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
false
)
);
if(!_.isEqual(tmpValue, value)) {
onTableEvent?.('columnEdited');
}
}, [dispatch, baseValue, tmpValue]);
const editView = useMemo(
() => editViewFn?.({ value, onChange, onChangeEnd }) ?? <></>,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,40 @@
import { default as Input } from "antd/es/input";
import { NumberControl, StringControl } from "comps/controls/codeControl";
import { default as InputNumber } from "antd/es/input-number";
import { NumberControl, RangeControl, StringControl } from "comps/controls/codeControl";
import { BoolControl } from "comps/controls/boolControl";
import { trans } from "i18n";
import { ColumnTypeCompBuilder, ColumnTypeViewFn } from "../columnTypeCompBuilder";
import { ColumnValueTooltip } from "../simpleColumnTypeComps";
import { withDefault } from "comps/generators";
import styled from "styled-components";

const InputNumberWrapper = styled.div`
.ant-input-number {
width: 100%;
border-radius: 0;
background: transparent !important;
padding: 0 !important;
box-shadow: none;

input {
padding: 0;
border-radius: 0;
}
}
`;

const childrenMap = {
text: NumberControl,
step: withDefault(NumberControl, 1),
precision: RangeControl.closed(0, 20, 0),
float: BoolControl,
prefix: StringControl,
suffix: StringControl,
};

let float = false;
let step = 1;
let precision = 0;

const getBaseValue: ColumnTypeViewFn<typeof childrenMap, number, number> = (
props
) => {
Expand All @@ -24,26 +46,35 @@ export const ColumnNumberComp = (function () {
childrenMap,
(props, dispatch) => {
float = props.float;
const value = !float ? Math.floor(props.changeValue ?? getBaseValue(props, dispatch)) : props.changeValue ?? getBaseValue(props, dispatch);
return props.prefix + value + props.suffix;
step = props.step;
precision = props.precision;
const value = props.changeValue ?? getBaseValue(props, dispatch);
let formattedValue: string | number = !float ? Math.floor(value) : value;
if(float) {
formattedValue = formattedValue.toPrecision(precision + 1);
}
return props.prefix + formattedValue + props.suffix;
},
(nodeValue) => nodeValue.text.value,
getBaseValue,
)
.setEditViewFn((props) => {
return (
<Input
type="number"
step={float?"0.01": "1"}
defaultValue={props.value}
autoFocus
bordered={false}
onChange={(e) => {
props.onChange(!float ? Math.floor(e.target.valueAsNumber) : e.target.valueAsNumber);
}}
onBlur={props.onChangeEnd}
onPressEnter={props.onChangeEnd}
/>
<InputNumberWrapper>
<InputNumber
step={step}
defaultValue={props.value}
autoFocus
bordered={false}
onChange={(value) => {
value = value ?? 0;
props.onChange(!float ? Math.floor(value) : value);
}}
precision={float ? precision : 0}
onBlur={props.onChangeEnd}
onPressEnter={props.onChangeEnd}
/>
</InputNumberWrapper>
)})
.setPropertyViewFn((children) => {
return (
Expand All @@ -52,17 +83,36 @@ export const ColumnNumberComp = (function () {
label: trans("table.columnValue"),
tooltip: ColumnValueTooltip,
})}
{children.step.propertyView({
label: trans("table.numberStep"),
tooltip: trans("table.numberStepTooltip"),
onFocus: (focused) => {
if(!focused) {
const value = children.step.getView();
const isFloat = children.float.getView();
const newValue = !isFloat ? Math.floor(value) : value;
children.step.dispatchChangeValueAction(String(newValue));
}
}
})}
{float && (
children.precision.propertyView({
label: trans("table.precision"),
})
)}
{children.prefix.propertyView({
label: trans("table.prefix"),
// tooltip: ColumnValueTooltip,
})}
{children.suffix.propertyView({
label: trans("table.suffix"),
// tooltip: ColumnValueTooltip,
})}
{children.float.propertyView({
label: trans("table.float"),
// tooltip: ColumnValueTooltip,
onChange: (isFloat) => {
const value = children.step.getView();
const newValue = !isFloat ? Math.floor(value) : value;
children.step.dispatchChangeValueAction(String(newValue));
}
})}
</>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { EllipsisOutlined } from "@ant-design/icons";
import { default as Dropdown} from "antd/es/dropdown";
import { default as Menu } from "antd/es/menu";
import { ColumnTypeCompBuilder } from "comps/comps/tableComp/column/columnTypeCompBuilder";
import { ActionSelectorControlInContext } from "comps/controls/actionSelector/actionSelectorControl";
Expand All @@ -12,18 +10,6 @@ import styled from "styled-components";
import { ColumnLink } from "comps/comps/tableComp/column/columnTypeComps/columnLinkComp";
import { LightActiveTextColor, PrimaryColor } from "constants/style";

const LinksWrapper = styled.div`
white-space: nowrap;

> a {
margin-right: 8px;
}

> a:last-child {
margin-right: 0;
}
`;

const MenuLinkWrapper = styled.div`
> a {
color: ${PrimaryColor} !important;
Expand All @@ -34,6 +20,22 @@ const MenuLinkWrapper = styled.div`
}
`;

const MenuWrapper = styled.div`
ul {
background: transparent !important;
border-bottom: 0;

li {
padding: 0 10px 0 0 !important;
line-height: normal !important;

&::after {
content: none !important;
}
}
}
`;

const OptionItem = new MultiCompBuilder(
{
label: StringControl,
Expand Down Expand Up @@ -69,48 +71,28 @@ export const ColumnLinksComp = (function () {
return new ColumnTypeCompBuilder(
childrenMap,
(props) => {
const menu = props.options.length > 3 && (
<Menu>
{props.options
.filter((o) => !o.hidden)
.slice(3)
.map((option, index) => (
<Menu.Item key={index}>
<MenuLinkWrapper>
<ColumnLink
disabled={option.disabled}
label={option.label}
onClick={option.onClick}
/>
</MenuLinkWrapper>
</Menu.Item>
))}
</Menu>
);
const menuItems = props.options
.filter((o) => !o.hidden)
.map((option, index) => (
{
key: index,
label: (
<MenuLinkWrapper>
<ColumnLink
disabled={option.disabled}
label={option.label}
onClick={option.onClick}
/>
</MenuLinkWrapper>
)
}
));

return (
<LinksWrapper>
{props.options
.filter((o) => !o.hidden)
.slice(0, 3)
.map((option, i) => (
<ColumnLink
key={i}
disabled={option.disabled}
label={option.label}
onClick={option.onClick}
/>
))}
{menu && (
<Dropdown
trigger={["hover"]}
dropdownRender={() => menu}
>
<EllipsisOutlined onClick={(e) => e.preventDefault()} />
</Dropdown>
)}
</LinksWrapper>
);
<MenuWrapper>
<Menu mode="horizontal" items={menuItems} />
</MenuWrapper>
)
},
() => ""
)
Expand Down
Loading