Skip to content

Commit e051787

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #1358 from lowcoder-org/ee-setup
EE setup
2 parents d3dc295 + aa18189 commit e051787

File tree

508 files changed

+19668
-4202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

508 files changed

+19668
-4202
lines changed

‎.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"titleBar.activeForeground": "#F9FAF2"
66
},
77
"java.debug.settings.onBuildFailureProceed": true,
8-
"java.configuration.updateBuildConfiguration": "automatic"
8+
"java.configuration.updateBuildConfiguration": "automatic",
9+
"terminal.integrated.scrollback": 100000000,
910
}

‎client/packages/lowcoder-design/src/components/Dropdown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export function Dropdown<T extends OptionsType>(props: DropdownProps<T>) {
184184
<CustomSelect
185185
open={props.open}
186186
listHeight={props.lineHeight}
187-
popupClassName="ob-dropdown-control-select"
187+
classNames={{popup: { root: "ob-dropdown-control-select"}}}
188188
showSearch={props.showSearch}
189189
filterOption={(input, option) => {
190190
if (props.optionFilterProp) {
@@ -216,7 +216,7 @@ export function Dropdown<T extends OptionsType>(props: DropdownProps<T>) {
216216
allowClear={props.allowClear}
217217
placeholder={props.placeholder}
218218
optionLabelProp={props.optionLabelProp}
219-
dropdownRender={(menu) =>
219+
popupRender={(menu) =>
220220
props.preNode ? (
221221
<>
222222
{props.preNode()}

‎client/packages/lowcoder-design/src/components/TriggeredDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function TriggeredDialog(props: {
4040
<CustomModal
4141
open={visible}
4242
title={modalTitle}
43-
destroyOnClose
43+
destroyOnHidden
4444
onCancel={() => setVisible(false)}
4545
showOkButton={false}
4646
showCancelButton={false}

‎client/packages/lowcoder-design/src/components/colorSelect/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const ColorSelect = (props: ColorSelectProps) => {
4848

4949
useEffect(() => {
5050
if (color !== selectedColor) {
51-
const value = getGradientObject();
51+
const value = getGradientObject("#ffffff");
5252
if (!value?.isGradient) {
5353
return throttleChange(toHex(selectedColor));
5454
}

‎client/packages/lowcoder-design/src/components/customSelect.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const CustomSelect = React.forwardRef<HTMLDivElement, CustomSelectProps>((
9696
return (
9797
<SelectWrapper className={className} ref={ref} $border={border}>
9898
<AntdSelect
99-
popupClassName={popupClassName}
99+
classNames={{popup: { root: popupClassName }}}
100100
popupMatchSelectWidth={false}
101101
suffixIcon={<PackUpIcon />}
102102
{...restProps}

‎client/packages/lowcoder-design/src/components/form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ const FormSelect = (props: any) => {
331331
}}
332332
popupMatchSelectWidth={false}
333333
placeholder={props.placeholder}
334-
dropdownRender={props.dropdownRender}
334+
popupRender={props.dropdownRender}
335335
>
336336
{props.options?.map((item: any) => {
337337
return (

‎client/packages/lowcoder-design/src/components/tacoInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ function PhoneNumberInput(props: {
283283
<CustomSelect
284284
disabled
285285
style={{ width: "80px", height: "38px" }}
286-
dropdownStyle={{ width: "408px" }}
286+
styles={{ popup: { root: { width: "408px" }}}}
287287
defaultValue={defaultCountryCode}
288288
optionLabelProp="value"
289289
onChange={(value) => {

‎client/packages/lowcoder-design/src/icons/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,11 @@ export { ReactComponent as APIDocsIcon } from "./remix/instance-line.svg";
132132
export { ReactComponent as SubscriptionIcon } from "./remix/award-fill.svg";
133133
export { ReactComponent as SupportIcon } from "./remix/user-heart-line.svg";
134134
// export { ReactComponent as AllAppIcon } from "./v1/icon-all-app.svg";
135-
135+
// EE
136+
export { ReactComponent as EnvironmentsIcon } from "./remix/git-branch-line.svg";
137+
export { ReactComponent as UsageStatisticsIcon } from "./remix/line-chart-line.svg";
138+
export { ReactComponent as AutitLogsIcon } from "./remix/user-community-line.svg";
139+
export { ReactComponent as BrandingIcon } from "./remix/paint-brush-line.svg";
136140

137141
// Data Sources
138142
export { ReactComponent as MysqlIcon } from "./v1/icon-query-MySQL.svg";

‎client/packages/lowcoder-design/src/icons/remix/account-box-2-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/account-box-2-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/account-circle-2-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/account-circle-2-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/add-large-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/add-large-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/aed-electrodes-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/aed-electrodes-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/aed-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/aed-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/ai-generate-2.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/ai-generate-text.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/ai-generate.svg

Lines changed: 1 addition & 1 deletion
Loading

‎client/packages/lowcoder-design/src/icons/remix/alarm-snooze-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/alarm-snooze-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/alibaba-cloud-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/alibaba-cloud-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-bottom-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-bottom-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-horizontal-center-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-horizontal-center-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-left-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-left-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-right-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-right-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-top-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-top-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-vertical-center-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/align-item-vertical-center-line.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/anthropic-fill.svg

Lines changed: 1 addition & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/remix/anthropic-line.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)