Skip to content

Commit fc55724

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into subscription-handling
2 parents 0d68d67 + dcd1373 commit fc55724

File tree

80 files changed

+1376
-1104
lines changed

Some content is hidden

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

80 files changed

+1376
-1104
lines changed

‎client/packages/lowcoder-core/lib/index.cjs

Lines changed: 114 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -9,118 +9,120 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
99

1010
var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
1111

12-
/******************************************************************************
13-
Copyright (c) Microsoft Corporation.
14-
15-
Permission to use, copy, modify, and/or distribute this software for any
16-
purpose with or without fee is hereby granted.
17-
18-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
19-
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
20-
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
21-
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
22-
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
23-
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
24-
PERFORMANCE OF THIS SOFTWARE.
25-
***************************************************************************** */
26-
/* global Reflect, Promise, SuppressedError, Symbol */
27-
28-
var extendStatics = function(d, b) {
29-
extendStatics = Object.setPrototypeOf ||
30-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
31-
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
32-
return extendStatics(d, b);
33-
};
34-
35-
function __extends(d, b) {
36-
if (typeof b !== "function" && b !== null)
37-
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
38-
extendStatics(d, b);
39-
function __() { this.constructor = d; }
40-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
41-
}
42-
43-
var __assign = function() {
44-
__assign = Object.assign || function __assign(t) {
45-
for (var s, i = 1, n = arguments.length; i < n; i++) {
46-
s = arguments[i];
47-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
48-
}
49-
return t;
50-
};
51-
return __assign.apply(this, arguments);
52-
};
53-
54-
function __rest(s, e) {
55-
var t = {};
56-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
57-
t[p] = s[p];
58-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
59-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
60-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
61-
t[p[i]] = s[p[i]];
62-
}
63-
return t;
64-
}
65-
66-
function __decorate(decorators, target, key, desc) {
67-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
68-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
69-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
70-
return c > 3 && r && Object.defineProperty(target, key, r), r;
71-
}
72-
73-
function __awaiter(thisArg, _arguments, P, generator) {
74-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
75-
return new (P || (P = Promise))(function (resolve, reject) {
76-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
77-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
78-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
79-
step((generator = generator.apply(thisArg, _arguments || [])).next());
80-
});
81-
}
82-
83-
function __generator(thisArg, body) {
84-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
85-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
86-
function verb(n) { return function (v) { return step([n, v]); }; }
87-
function step(op) {
88-
if (f) throw new TypeError("Generator is already executing.");
89-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
90-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
91-
if (y = 0, t) op = [op[0] & 2, t.value];
92-
switch (op[0]) {
93-
case 0: case 1: t = op; break;
94-
case 4: _.label++; return { value: op[1], done: false };
95-
case 5: _.label++; y = op[1]; op = [0]; continue;
96-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
97-
default:
98-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
99-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
100-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
101-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
102-
if (t[2]) _.ops.pop();
103-
_.trys.pop(); continue;
104-
}
105-
op = body.call(thisArg, _);
106-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
107-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
108-
}
109-
}
110-
111-
function __spreadArray(to, from, pack) {
112-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
113-
if (ar || !(i in from)) {
114-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
115-
ar[i] = from[i];
116-
}
117-
}
118-
return to.concat(ar || Array.prototype.slice.call(from));
119-
}
120-
121-
typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
122-
var e = new Error(message);
123-
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
12+
/******************************************************************************
13+
Copyright (c) Microsoft Corporation.
14+
15+
Permission to use, copy, modify, and/or distribute this software for any
16+
purpose with or without fee is hereby granted.
17+
18+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
19+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
20+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
21+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
22+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
23+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
24+
PERFORMANCE OF THIS SOFTWARE.
25+
***************************************************************************** */
26+
/* global Reflect, Promise, SuppressedError, Symbol */
27+
28+
// https://github.com/microsoft/tslib
29+
30+
var extendStatics = function(d, b) {
31+
extendStatics = Object.setPrototypeOf ||
32+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
33+
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
34+
return extendStatics(d, b);
35+
};
36+
37+
function __extends(d, b) {
38+
if (typeof b !== "function" && b !== null)
39+
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
40+
extendStatics(d, b);
41+
function __() { this.constructor = d; }
42+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
43+
}
44+
45+
var __assign = function() {
46+
__assign = Object.assign || function __assign(t) {
47+
for (var s, i = 1, n = arguments.length; i < n; i++) {
48+
s = arguments[i];
49+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
50+
}
51+
return t;
52+
};
53+
return __assign.apply(this, arguments);
54+
};
55+
56+
function __rest(s, e) {
57+
var t = {};
58+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
59+
t[p] = s[p];
60+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
61+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
62+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
63+
t[p[i]] = s[p[i]];
64+
}
65+
return t;
66+
}
67+
68+
function __decorate(decorators, target, key, desc) {
69+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
70+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
71+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
72+
return c > 3 && r && Object.defineProperty(target, key, r), r;
73+
}
74+
75+
function __awaiter(thisArg, _arguments, P, generator) {
76+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
77+
return new (P || (P = Promise))(function (resolve, reject) {
78+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
79+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
80+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
81+
step((generator = generator.apply(thisArg, _arguments || [])).next());
82+
});
83+
}
84+
85+
function __generator(thisArg, body) {
86+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
87+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
88+
function verb(n) { return function (v) { return step([n, v]); }; }
89+
function step(op) {
90+
if (f) throw new TypeError("Generator is already executing.");
91+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
92+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
93+
if (y = 0, t) op = [op[0] & 2, t.value];
94+
switch (op[0]) {
95+
case 0: case 1: t = op; break;
96+
case 4: _.label++; return { value: op[1], done: false };
97+
case 5: _.label++; y = op[1]; op = [0]; continue;
98+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
99+
default:
100+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
101+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
102+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
103+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
104+
if (t[2]) _.ops.pop();
105+
_.trys.pop(); continue;
106+
}
107+
op = body.call(thisArg, _);
108+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
109+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
110+
}
111+
}
112+
113+
function __spreadArray(to, from, pack) {
114+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
115+
if (ar || !(i in from)) {
116+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
117+
ar[i] = from[i];
118+
}
119+
}
120+
return to.concat(ar || Array.prototype.slice.call(from));
121+
}
122+
123+
typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
124+
var e = new Error(message);
125+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
124126
};
125127

126128
function isEqualArgs(args, cacheArgs, equals) {

‎client/packages/lowcoder-core/lib/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ PERFORMANCE OF THIS SOFTWARE.
1717
***************************************************************************** */
1818
/* global Reflect, Promise, SuppressedError, Symbol */
1919

20+
// https://github.com/microsoft/tslib
21+
2022
var extendStatics = function(d, b) {
2123
extendStatics = Object.setPrototypeOf ||
2224
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const ModalWrapper = styled.div<ModalWrapperProps>`
2525
flex-direction: column;
2626
width: ${(props) => (props.$width ? props.$width : "368px")};
2727
height: fit-content;
28-
background:${(props) => props.$customStyles?.backgroundColor}; ;
28+
background:${(props) => props.$customStyles?.backgroundColor || '#ffffff'};
2929
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
3030
border-radius: 8px;
3131
padding: 0 0 16px;

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import styled, { css } from "styled-components";
22
import { CSSProperties } from "react";
3+
import { default as Skeleton } from "antd/es/skeleton";
34

45
type LoadingContainerProps = {
56
$backgroundColor: string;
@@ -12,6 +13,8 @@ const LoadingWrapper = styled.div`
1213
flex-direction: column;
1314
align-items: center;
1415
justify-content: center;
16+
width: 100%;
17+
height: 100%;
1518
`;
1619

1720
// Loading
@@ -61,6 +64,10 @@ const Load2 = styled.div<LoadingContainerProps>`
6164
linear-gradient(to right, ${(props) => props.$color}a3, ${(props) => props.$color}1a);
6265
`;
6366

67+
const StyledSkeleton = styled(Skeleton)`
68+
height: 100%;
69+
`;
70+
6471
type LoadingProps = {
6572
backgroundColor?: string;
6673
color?: string;
@@ -77,14 +84,15 @@ export const Loading = (props: LoadingProps) => {
7784
};
7885
return (
7986
<LoadingWrapper className={props.className} style={props.style}>
80-
<ContainerX {...loadingProps}>
87+
{/* <ContainerX {...loadingProps}>
8188
<Container {...loadingProps}>
8289
<Load1 {...loadingProps} />
8390
</Container>
8491
<Container {...loadingProps}>
8592
<Load2 {...loadingProps} />
8693
</Container>
87-
</ContainerX>
94+
</ContainerX> */}
95+
<StyledSkeleton active style={{height: '100%', animationDuration: '2s'}} />
8896
</LoadingWrapper>
8997
);
9098
};

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import Button, { ButtonProps } from "antd/es/button";
2+
import Spin from "antd/es/spin";
3+
import LoadingOutlined from "@ant-design/icons/LoadingOutlined"
24
import styled, { css } from "styled-components";
35
import { Loading } from "./Loading";
46
import * as React from "react";
@@ -206,10 +208,10 @@ const TacoButton = forwardRef(
206208
{props.icon}
207209
{props.children}
208210
</span>
209-
<Loading
211+
<Spin
212+
size="small"
213+
indicator={<LoadingOutlined spin style={{color: 'white'}} />}
210214
style={loadingStyle}
211-
backgroundColor={loadingBackground}
212-
color={loadingColor}
213215
/>
214216
</>
215217
) : (

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

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

0 commit comments

Comments
 (0)