Skip to content

Commit a9f53f0

Browse files
MenamAfzalMenamAfzal
committed
pull from origin
1 parent 6fa4c5f commit a9f53f0

File tree

64 files changed

+8337
-11608
lines changed

Some content is hidden

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

64 files changed

+8337
-11608
lines changed

‎client/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.6
1+
2.4.8

‎client/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.4.6",
3+
"version": "2.4.8",
44
"type": "module",
55
"private": true,
66
"workspaces": [
@@ -24,7 +24,7 @@
2424
"devDependencies": {
2525
"@babel/preset-env": "^7.20.2",
2626
"@babel/preset-typescript": "^7.18.6",
27-
"@rollup/plugin-typescript": "^8.5.0",
27+
"@rollup/plugin-typescript": "^12.1.0",
2828
"@testing-library/jest-dom": "^5.16.5",
2929
"@types/file-saver": "^2.0.5",
3030
"@types/jest": "^29.2.2",
@@ -84,7 +84,7 @@
8484
"react-countup": "^6.5.3",
8585
"react-player": "^2.11.0",
8686
"resize-observer-polyfill": "^1.5.1",
87-
"rollup": "^4.13.0",
87+
"rollup": "^4.22.5",
8888
"simplebar": "^6.2.5",
8989
"tui-image-editor": "^3.15.3"
9090
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ export function Dropdown<T extends OptionsType>(props: DropdownProps<T>) {
163163
const dropdownElems = document.querySelectorAll<HTMLElement>("div.ant-dropdown ul.ant-dropdown-menu");
164164
for (let index = 0; index < dropdownElems.length; index++) {
165165
const element = dropdownElems[index];
166-
console.log(element);
167166
element.style.maxHeight = "300px";
168167
element.style.overflowY = "scroll";
169168
element.style.minWidth = "150px";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ function Option<T extends ConstructorToComp<MultiCompConstructor>>(props: {
273273
del={props.onDel ? () => props.onDel!(index) : undefined}
274274
>
275275
<StyledPointIcon
276-
onClick={(e) => {
276+
onClick={(e: any) => {
277277
e.stopPropagation();
278278
}}
279279
/>

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

-727
This file was deleted.

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

+728
Large diffs are not rendered by default.

‎client/packages/lowcoder-design/src/index.ts

+104-39
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,119 @@
1-
export * from "./components/Collapase";
1+
import React from "react";
2+
3+
export const Collapse = React.lazy(() => import("./components/Collapase").then(module => ({ default: module.Collapse })));
4+
export const PadDiv = React.lazy(() => import("./components/Collapase").then(module => ({ default: module.PadDiv })));
5+
export const UnShow = React.lazy(() => import("./components/Collapase").then(module => ({ default: module.UnShow})));
26
export * from "./components/CustomModal";
3-
export * from "./components/Drawer";
4-
export * from "./components/Dropdown";
5-
export * from "./components/ExternalLink";
7+
export const Drawer = React.lazy(() => import("./components/Drawer").then(module => ({ default: module.Drawer })));
8+
export * from "./components/Dropdown"
9+
export const ExternalLink = React.lazy(() => import("./components/ExternalLink").then(module => ({ default: module.ExternalLink })));
10+
export const DocLink = React.lazy(() => import("./components/ExternalLink").then(module => ({ default: module.DocLink })));
611
export * from "./components/GlobalInstances";
7-
export * from "./components/Input";
8-
export * from "./components/Label";
9-
export * from "./components/Menu";
10-
export * from "./components/MenuItem";
11-
export * from "./components/Modal";
12-
export * from "./components/ScrollBar";
13-
export * from "./components/Search";
14-
export * from "./components/Section";
15-
export * from "./components/SuspensionBox";
16-
export * from "./components/Switch";
17-
export * from "./components/Tab";
18-
export * from "./components/Table";
19-
export * from "./components/Trees";
12+
export const Input = React.lazy(() => import("./components/Input").then(module => ({ default: module.Input })));
13+
export const StyledInput = React.lazy(() => import("./components/Input").then(module => ({ default: module.StyledInput })));
14+
export { EllipsisTextCss, labelCss, CommonTextLabel, CommonGrayLabel } from "./components/Label";
15+
export const BlockGrayLabel = React.lazy(() => import("./components/Label").then(module => ({ default: module.BlockGrayLabel })));
16+
export const TextLabel = React.lazy(() => import("./components/Label").then(module => ({ default: module.TextLabel })));
17+
export const BlockLabel = React.lazy(() => import("./components/Label").then(module => ({ default: module.BlockLabel })));
18+
export const CollapseTitle = React.lazy(() => import("./components/Label").then(module => ({ default: module.CollapseTitle })));
19+
export const CollapseLabel = React.lazy(() => import("./components/Label").then(module => ({ default: module.CollapseLabel })));
20+
export const CollapseLink = React.lazy(() => import("./components/Label").then(module => ({ default: module.CollapseLink })));
21+
export const CommonTextLabel2 = React.lazy(() => import("./components/Label").then(module => ({ default: module.CommonTextLabel2 })));
22+
export const CommonErrorLabel = React.lazy(() => import("./components/Label").then(module => ({ default: module.CommonErrorLabel })));
23+
export const CommonBlueLabel = React.lazy(() => import("./components/Label").then(module => ({ default: module.CommonBlueLabel })));
24+
export const Menu = React.lazy(() => import("./components/Menu").then(module => ({ default: module.Menu })));
25+
export const DropdownMenu = React.lazy(() => import("./components/Menu").then(module => ({ default: module.DropdownMenu })));
26+
export const DropDownSubMenu = React.lazy(() => import("./components/Menu").then(module => ({ default: module.DropDownSubMenu })));
27+
export const MenuItemWithDelete = React.lazy(() => import("./components/Menu").then(module => ({ default: module.MenuItemWithDelete })));
28+
export const MenuItem = React.lazy(() => import("./components/MenuItem").then(module => ({ default: module.MenuItem })));
29+
export const FormItem = React.lazy(() => import("./components/MenuItem").then(module => ({ default: module.FormItem})));
30+
export const Modal = React.lazy(() => import("./components/Modal").then(module => ({ default: module.Modal})));
31+
export const ScrollBar = React.lazy(() => import("./components/ScrollBar").then(module => ({ default: module.ScrollBar})));
32+
export const Search = React.lazy(() => import("./components/Search").then(module => ({ default: module.Search })));
33+
export {PropertySectionContext, sectionNames} from "./components/Section";
34+
export type { PropertySectionState, PropertySectionContextType } from "./components/Section";
35+
export const Section = React.lazy(() => import("./components/Section").then(module => ({ default: module.Section})));
36+
export const BaseSection = React.lazy(() => import("./components/Section").then(module => ({ default: module.BaseSection})));
37+
export const SuspensionBox = React.lazy(() => import("./components/SuspensionBox").then(module => ({ default: module.SuspensionBox })));
38+
export const Switch = React.lazy(() => import("./components/Switch").then(module => ({ default: module.Switch })));
39+
export const SwitchJsIcon = React.lazy(() => import("./components/Switch").then(module => ({ default: module.SwitchJsIcon })));
40+
export const SwitchWrapper = React.lazy(() => import("./components/Switch").then(module => ({ default: module.SwitchWrapper })));
41+
export const TacoSwitch = React.lazy(() => import("./components/Switch").then(module => ({ default: module.TacoSwitch })));
42+
export const Tabs = React.lazy(() => import("./components/Tab").then(module => ({ default: module.Tabs })));
43+
export const TableShow = React.lazy(() => import("./components/Table").then(module => ({ default: module.TableShow })));
44+
export const CustomTree = React.lazy(() => import("./components/Trees").then(module => ({ default: module.CustomTree})));
45+
export const BranchDiv = React.lazy(() => import("./components/Trees").then(module => ({ default: module.BranchDiv })));
46+
export const Treediv = React.lazy(() => import("./components/Trees").then(module => ({ default: module.Treediv})));
2047
export * from "./components/TriggeredDialog";
21-
export * from "./components/alert";
22-
export * from "./components/audio";
23-
export * from "./components/button";
24-
export * from "./components/checkBox";
25-
export * from "./components/colorSelect";
48+
export const Alert = React.lazy(() => import("./components/alert").then(module => ({ default: module.Alert })));
49+
export const TacoAudio = React.lazy(() => import("./components/audio").then(module => ({ default: module.TacoAudio })));
50+
export type { TacoButtonType } from "./components/button";
51+
export const BigButtonStyle = React.lazy(() => import("./components/button").then(module => ({ default: module.BigButtonStyle })));
52+
export const BlueButton = React.lazy(() => import("./components/button").then(module => ({ default: module.BlueButton })));
53+
export const RedButton = React.lazy(() => import("./components/button").then(module => ({ default: module.RedButton })));
54+
export const LinkButton = React.lazy(() => import("./components/button").then(module => ({ default: module.LinkButton })));
55+
export const TacoButton = React.lazy(() => import("./components/button").then(module => ({ default: module.TacoButton })));
56+
export const CheckBox = React.lazy(() => import("./components/checkBox").then(module => ({ default: module.CheckBox })));
2657
export * from "./components/colorSelect/colorUtils";
27-
export * from "./components/colorSelect/index";
58+
export const ColorSelect = React.lazy(() => import("./components/colorSelect/index").then(module => ({ default: module.ColorSelect })));
2859
export * from "./components/container";
2960
export * from "./components/control";
30-
export * from "./components/copyTextButton";
61+
export const CopyTextButton = React.lazy(() => import("./components/copyTextButton").then(module => ({ default: module.CopyTextButton})));
3162
export * from "./components/customSelect";
3263
export * from "./components/edit";
64+
export type { EditTextProps } from "./components/edit";
65+
export const EditText = React.lazy(() => import("./components/edit").then(module => ({ default: module.EditText })));
66+
export const EditTextWrapper = React.lazy(() => import("./components/edit").then(module => ({ default: module.EditTextWrapper })));
67+
export const TextWrapper = React.lazy(() => import("./components/edit").then(module => ({ default: module.TextWrapper })));
3368
export * from "./components/eventHandler";
3469
export * from "./components/form";
35-
export * from "./components/iconSelect";
36-
export * from "./components/image";
37-
export * from "./components/keyValueList";
38-
export * from "./components/Loading";
39-
export * from "./components/markdown";
70+
export { removeQuote, useIcon, iconPrefix } from "./components/iconSelect";
71+
export const IconSelect = React.lazy(() => import("./components/iconSelect").then(module => ({ default: module.IconSelect })));
72+
export const IconSelectBase = React.lazy(() => import("./components/iconSelect").then(module => ({ default: module.IconSelectBase})));
73+
export const TacoImage = React.lazy(() => import("./components/image").then(module => ({ default: module.TacoImage })));
74+
export const KeyValueList = React.lazy(() => import("./components/keyValueList").then(module => ({ default: module.KeyValueList })));
75+
export const Loading = React.lazy(() => import("./components/Loading").then(module => ({ default: module.Loading })));
76+
export const WhiteLoading = React.lazy(() => import("./components/Loading").then(module => ({ default: module.WhiteLoading })));
77+
export const LightLoading = React.lazy(() => import("./components/Loading").then(module => ({ default: module.LightLoading })));
78+
export { markdownCompCss } from "./components/markdown";
79+
export const TacoMarkDown = React.lazy(() => import("./components/markdown").then(module => ({ default: module.TacoMarkDown })));
4080
export * from "./components/mockData";
4181
export * from "./components/option";
42-
export * from "./components/popover";
43-
export * from "./components/popupCard";
44-
export * from "./components/query";
45-
export * from "./components/selectedComps";
46-
export * from "./components/tacoInput";
47-
export * from "./components/tacoPagination";
48-
export * from "./components/toolTip";
49-
export * from "./components/video";
50-
export * from "./components/shapeSelect";
82+
export type { EditPopoverItemType, EditPopoverProps } from "./components/popover";
83+
export const CustomPopover = React.lazy(() => import("./components/popover").then(module => ({ default: module.CustomPopover })));
84+
export const SimplePopover = React.lazy(() => import("./components/popover").then(module => ({ default: module.SimplePopover })));
85+
export const EditPopover = React.lazy(() => import("./components/popover").then(module => ({ default: module.EditPopover})));
86+
export const PopupCard = React.lazy(() => import("./components/popupCard").then(module => ({ default: module.PopupCard })));
87+
export const QueryPropertyViewWrapper = React.lazy(() => import("./components/query").then(module => ({ default: module.QueryPropertyViewWrapper })));
88+
export const QueryAlert = React.lazy(() => import("./components/query").then(module => ({ default: module.QueryAlert })));
89+
export const QuerySectionWrapper = React.lazy(() => import("./components/query").then(module => ({ default: module.QuerySectionWrapper })));
90+
export const QueryConfigWrapper = React.lazy(() => import("./components/query").then(module => ({ default: module.QueryConfigWrapper })));
91+
export const QueryConfigLabel = React.lazy(() => import("./components/query").then(module => ({ default: module.QueryConfigLabel })));
92+
export const QueryConfigItemWrapper = React.lazy(() => import("./components/query").then(module => ({ default: module.QueryConfigItemWrapper })));
93+
export const QueryTutorialButton = React.lazy(() => import("./components/query").then(module => ({ default: module.QueryTutorialButton })));
94+
export const TriggerTypeStyled = React.lazy(() => import("./components/query").then(module => ({ default: module.TriggerTypeStyled })));
95+
export const SelectedComps = React.lazy(() => import("./components/selectedComps").then(module => ({ default: module.SelectedComps})));
96+
export const TacoInput = React.lazy(() => import("./components/tacoInput").then(module => ({ default: module.TacoInput })));
97+
export const BlurFinishInput = React.lazy(() => import("./components/tacoInput").then(module => ({ default: module.BlurFinishInput })));
98+
export const PhoneNumberInput = React.lazy(() => import("./components/tacoInput").then(module => ({ default: module.PhoneNumberInput })));
99+
export const OtpFormInput = React.lazy(() => import("./components/tacoInput").then(module => ({ default: module.OtpFormInput })));
100+
export const FormInput = React.lazy(() => import("./components/tacoInput").then(module => ({ default: module.FormInput })));
101+
export const PasswordInput = React.lazy(() => import("./components/tacoInput").then(module => ({ default: module.PasswordInput })));
102+
export { pageItemRender } from "./components/tacoPagination";
103+
export const TacoPagination = React.lazy(() => import("./components/tacoPagination").then(module => ({ default: module.TacoPagination })));
104+
export { UnderlineCss } from "./components/toolTip";
105+
export const TooltipCodeBlock = React.lazy(() => import("./components/toolTip").then(module => ({ default: module.TooltipCodeBlock})));
106+
export const TooltipLink = React.lazy(() => import("./components/toolTip").then(module => ({ default: module.TooltipLink})));
107+
export const TutorialsTooltip = React.lazy(() => import("./components/toolTip").then(module => ({ default: module.TutorialsTooltip})));
108+
export const CommonTipsOverlay = React.lazy(() => import("./components/toolTip").then(module => ({ default: module.CommonTipsOverlay})));
109+
export const Tooltip = React.lazy(() => import("./components/toolTip").then(module => ({ default: module.Tooltip})));
110+
export const ToolTipLabel = React.lazy(() => import("./components/toolTip").then(module => ({ default: module.ToolTipLabel})));
111+
export { playIcon } from "./components/video";
112+
export const Video = React.lazy(() => import("./components/video").then(module => ({ default: module.Video })));
113+
export const Container = React.lazy(() => import("./components/video").then(module => ({ default: module.Container})));
114+
export { useShape } from "./components/shapeSelect";
115+
export const ShapeSelect = React.lazy(() => import("./components/shapeSelect").then(module => ({ default: module.ShapeSelect })));
116+
export const ShapeSelectBase = React.lazy(() => import("./components/shapeSelect").then(module => ({ default: module.ShapeSelectBase})));
51117

52118
export * from "./icons";
53-
54119
export * from "./icons/antIcon";

‎client/packages/lowcoder-sdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-sdk",
3-
"version": "2.4.13",
3+
"version": "2.4.14",
44
"type": "module",
55
"files": [
66
"src",

‎client/packages/lowcoder/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"@fortawesome/free-solid-svg-icons": "^6.5.1",
2626
"@fortawesome/react-fontawesome": "latest",
2727
"@manaflair/redux-batch": "^1.0.0",
28-
"@rjsf/antd": "^5.18.6",
29-
"@rjsf/core": "^5.18.6",
30-
"@rjsf/utils": "^5.18.6",
31-
"@rjsf/validator-ajv8": "^5.18.6",
28+
"@rjsf/antd": "^5.21.2",
29+
"@rjsf/core": "^5.21.2",
30+
"@rjsf/utils": "^5.21.2",
31+
"@rjsf/validator-ajv8": "^5.21.2",
3232
"@types/lodash": "^4.14.194",
3333
"@types/node": "^16.7.13",
3434
"@types/react": "^18.2.45",

‎client/packages/lowcoder/src/components/ThemeSettingsSelector.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
428428
size="small"
429429
checked={showComponentLoaders}
430430
onChange={(value) => {
431-
debugger;
432431
setComponentLoaders(value)
433432
configChange({ themeSettingKey, showComponentLoadingIndicators: value});
434433
}}

‎client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ function AppSettingsModal(props: ChildrenInstance) {
234234
useEffect(() => {
235235
setLowcoderCompVersions([
236236
'latest',
237-
...Object.keys(lowcoderCompsMeta.versions).reverse()
237+
...Object.keys(lowcoderCompsMeta?.versions || []).reverse()
238238
])
239239
}, [lowcoderCompsMeta])
240240

‎client/packages/lowcoder/src/comps/comps/jsonSchemaFormComp/ArrayFieldTemplate.tsx

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
import React from 'react';
2+
import { Button, Row, Col } from 'antd';
3+
import { ArrayFieldTemplateProps } from '@rjsf/utils';
4+
import { ArrowDownOutlined, ArrowUpOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons';
5+
6+
const ArrayFieldTemplate = (props: ArrayFieldTemplateProps) => {
7+
const { items, canAdd, onAddClick, title } = props;
8+
9+
return (
10+
<fieldset>
11+
{title && <legend>{title}</legend>}
12+
<Row gutter={[0, 0]}>
13+
{items.map((element: any) => (
14+
<Col key={element.index} span={24} style={{ display: 'flex', alignItems: 'center' }}>
15+
{/* Content container for the array item */}
16+
<div style={{ flexGrow: 1 }}>
17+
{element.children}
18+
</div>
19+
20+
{/* Container for the control buttons with vertical alignment */}
21+
<div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-end', paddingTop: "58px" }}>
22+
{/* Move down button */}
23+
{element.hasMoveDown && (
24+
<Button
25+
type="default"
26+
icon={<ArrowDownOutlined />}
27+
onClick={element.onReorderClick(element.index, element.index + 1)}
28+
style={{ marginLeft: '4px' }}
29+
/>
30+
)}
31+
32+
{/* Move up button */}
33+
{element.hasMoveUp && (
34+
<Button
35+
type="default"
36+
icon={<ArrowUpOutlined />}
37+
onClick={element.onReorderClick(element.index, element.index - 1)}
38+
style={{ marginLeft: '4px' }}
39+
/>
40+
)}
41+
42+
{/* Remove button */}
43+
{element.hasRemove && (
44+
<Button
45+
type="default"
46+
icon={<DeleteOutlined />}
47+
danger
48+
onClick={element.onDropIndexClick(element.index)}
49+
style={{ marginLeft: '4px' }}
50+
/>
51+
)}
52+
</div>
53+
</Col>
54+
))}
55+
{/* Add button for the array */}
56+
{canAdd && (
57+
<Col span={24} style={{ textAlign: 'center' }}>
58+
<Button type="dashed" onClick={onAddClick} icon={<PlusOutlined />}>
59+
Add Item
60+
</Button>
61+
</Col>
62+
)}
63+
</Row>
64+
</fieldset>
65+
);
66+
};
67+
68+
export default ArrayFieldTemplate;

0 commit comments

Comments
 (0)