Jan 31, 2025 · Jan 30, 2025
diff --git a/client/packages/lowcoder-design/src/components/Trees.tsx b/client/packages/lowcoder-design/src/components/Trees.tsx
    background-color: #d7d9e0;
  }
 `;
 export const BranchDiv = styled.div<{ $type?: "inline" | "switch" }>`
 export const BranchDiv = styled.div<{ $type?: "inline" | "switch"| "center"}>`
  position: relative;
  ${BranchStyle}
  ${(props) => {
            bottom: 11px;
          }
        `;
      case "center":
        return css`
          &::before {
            top: calc(50% - 2px);
          }

          &::after {
            top: 50%;
          }
        `;
      default:
        return css``;
    }
diff --git a/client/packages/lowcoder-design/src/components/keyValueList.tsx b/client/packages/lowcoder-design/src/components/keyValueList.tsx
 import { ReactNode } from "react";
 import { BluePlusIcon } from "icons";
 import { trans } from "i18n/design";
 import { BranchDiv } from "./Trees";

 const KeyValueListItem = styled.div`
  display: flex;
  onAdd: () => void;
  onDelete: (item: ReactNode, index: number) => void;
  isStatic?: boolean;
 }) => (
  <>
  indicatorForAll?: boolean;
 }) => {
  let IndicatorWrapper = ({children}: any) => (<>{children}</>);
  if(props.indicatorForAll) IndicatorWrapper = BranchDiv;
  return <>
    {props.list.map((item, index) => (
      <KeyValueListItem key={index /* FIXME: find a proper key instead of `index` */}>
        {item}
        {!props.isStatic &&
          <DelIcon
            onClick={() => props.list.length > 1 && props.onDelete(item, index)}
            $forbidden={props.list.length === 1}
          />
        }
      </KeyValueListItem>
      <IndicatorWrapper $type={"inline"} key={index}>
        <KeyValueListItem key={index /* FIXME: find a proper key instead of `index` */}>
          {item}
          {!props.isStatic &&
            <DelIcon
              onClick={() => props.list.length > 1 && props.onDelete(item, index)}
              $forbidden={props.list.length === 1}
            />
          }
        </KeyValueListItem>
      </IndicatorWrapper>
    ))}
    {!props.isStatic &&
    <AddBtn onClick={props.onAdd}>
    </AddBtn>
    }
  </>
 );
 };
diff --git a/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx b/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx
      layout: "vertical",
      isStatic: true,
      keyFixed: true,
      indicatorForAll: true,
    });
  }, [comp.children.queryVariables.getView()])

          )}
        </EditorContext.Consumer>
      </BranchDiv>
      <BranchDiv>
        <EditorContext.Consumer>
          {(editorState) => getVariableOptions(editorState)}
        </EditorContext.Consumer>
      </BranchDiv>
      <EditorContext.Consumer>
        {(editorState) => getVariableOptions(editorState)}
      </EditorContext.Consumer>
    </>
  );
 }
diff --git a/client/packages/lowcoder/src/comps/controls/keyValueControl.tsx b/client/packages/lowcoder/src/comps/controls/keyValueControl.tsx
  valueFlexBasics?: number;
  isStatic?: boolean;
  keyFixed?: boolean;
  indicatorForAll?: boolean;
 };

 /**
            onAdd={() => this.dispatch(this.pushAction({}))}
            onDelete={(item, index) => this.dispatch(this.deleteAction(index))}
            isStatic={params.isStatic}
            indicatorForAll={params.indicatorForAll}
          />
        </ControlPropertyViewWrapper>
      );
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,7 +52,7 @@ const BranchStyle = css`
		background-color: #d7d9e0;
		}
		`;
		export const BranchDiv = styled.div<{ $type?: "inline" \| "switch" }>`
		export const BranchDiv = styled.div<{ $type?: "inline" \| "switch"\| "center"}>`
		position: relative;
		${BranchStyle}
		${(props) => {
Expand DownExpand Up		@@ -81,6 +81,16 @@ export const BranchDiv = styled.div<{ $type?: "inline" \| "switch" }>`
		bottom: 11px;
		}
		`;
		case "center":
		return css`
		&::before {
		top: calc(50% - 2px);
		}

		&::after {
		top: 50%;
		}
		`;
		default:
		return css``;
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@ import { TacoButton } from "./button";
		import { ReactNode } from "react";
		import { BluePlusIcon } from "icons";
		import { trans } from "i18n/design";
		import { BranchDiv } from "./Trees";

		const KeyValueListItem = styled.div`
		display: flex;
Expand DownExpand Up		@@ -77,18 +78,23 @@ export const KeyValueList = (props: {
		onAdd: () => void;
		onDelete: (item: ReactNode, index: number) => void;
		isStatic?: boolean;
		}) => (
		<>
		indicatorForAll?: boolean;
		}) => {
		let IndicatorWrapper = ({children}: any) => (<>{children}</>);
		if(props.indicatorForAll) IndicatorWrapper = BranchDiv;
		return <>
		{props.list.map((item, index) => (
		<KeyValueListItem key={index /* FIXME: find a proper key instead of `index` */}>
		{item}
		{!props.isStatic &&
		<DelIcon
		onClick={() => props.list.length > 1 && props.onDelete(item, index)}
		$forbidden={props.list.length === 1}
		/>
		}
		</KeyValueListItem>
		<IndicatorWrapper $type={"inline"} key={index}>
		<KeyValueListItem key={index /* FIXME: find a proper key instead of `index` */}>
		{item}
		{!props.isStatic &&
		<DelIcon
		onClick={() => props.list.length > 1 && props.onDelete(item, index)}
		$forbidden={props.list.length === 1}
		/>
		}
		</KeyValueListItem>
		</IndicatorWrapper>
		))}
		{!props.isStatic &&
		<AddBtn onClick={props.onAdd}>
Expand All		@@ -97,4 +103,4 @@ export const KeyValueList = (props: {
		</AddBtn>
		}
		</>
		);
		};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,6 +61,7 @@ const ExecuteQueryPropertyView = ({
		layout: "vertical",
		isStatic: true,
		keyFixed: true,
		indicatorForAll: true,
		});
		}, [comp.children.queryVariables.getView()])

Expand DownExpand Up		@@ -89,11 +90,9 @@ const ExecuteQueryPropertyView = ({
		)}
		</EditorContext.Consumer>
		</BranchDiv>
		<BranchDiv>
		<EditorContext.Consumer>
		{(editorState) => getVariableOptions(editorState)}
		</EditorContext.Consumer>
		</BranchDiv>
		<EditorContext.Consumer>
		{(editorState) => getVariableOptions(editorState)}
		</EditorContext.Consumer>
		</>
		);
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,6 +49,7 @@ export type KeyValueControlParams = ControlParams & {
		valueFlexBasics?: number;
		isStatic?: boolean;
		keyFixed?: boolean;
		indicatorForAll?: boolean;
		};

		/**
Expand DownExpand Up		@@ -143,6 +144,7 @@ export function keyValueListControl<T extends OptionsType>(
		onAdd={() => this.dispatch(this.pushAction({}))}
		onDelete={(item, index) => this.dispatch(this.deleteAction(index))}
		isStatic={params.isStatic}
		indicatorForAll={params.indicatorForAll}
		/>
		</ControlPropertyViewWrapper>
		);
Expand Down