Skip to content

Commit 3997d33

Browse files
Merge branch 'dev' into feature/error-boundary
2 parents 45cf141 + 400b932 commit 3997d33

File tree

18 files changed

+4255
-3238
lines changed

18 files changed

+4255
-3238
lines changed

client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"chalk": "4",
8181
"flag-icons": "^7.2.1",
8282
"number-precision": "^1.6.0",
83+
"posthog-js": "^1.144.1",
8384
"react-countup": "^6.5.3",
8485
"react-player": "^2.11.0",
8586
"resize-observer-polyfill": "^1.5.1",

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

Lines changed: 2052 additions & 1581 deletions
Large diffs are not rendered by default.

client/packages/lowcoder-core/lib/index.d.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// this is the tpyes file next to index.js
2-
31
/// <reference types="react" />
4-
import React, { ReactNode } from 'react';
2+
import * as react from 'react';
3+
import { ReactNode } from 'react';
4+
import * as react_jsx_runtime from 'react/jsx-runtime';
55

66
type EvalMethods = Record<string, Record<string, Function>>;
77
type CodeType = undefined | "JSON" | "Function" | "PureJSON";
@@ -337,7 +337,7 @@ interface SandBoxOption {
337337
declare function evalScript(script: string, context: any, methods?: EvalMethods): any;
338338
declare function evalFunc(functionBody: string, context: any, methods?: EvalMethods, options?: SandBoxOption, isAsync?: boolean): any;
339339

340-
declare function evalStyle(id: string, css: string[]): void;
340+
declare function evalStyle(id: string, css: string[], globalStyle?: boolean): void;
341341
declare function clearStyleEval(id?: string): void;
342342

343343
declare class DefaultParser {
@@ -456,7 +456,7 @@ declare enum CompActionTypes {
456456
* broadcast other actions in comp tree structure.
457457
* used for encapsulate MultiBaseComp
458458
*/
459-
BROADCAST = "BROADCAST",
459+
BROADCAST = "BROADCAST"
460460
}
461461
type ExtraActionType = "layout" | "delete" | "add" | "modify" | "rename" | "recover" | "upgrade";
462462
type ActionExtraInfo = {
@@ -650,9 +650,7 @@ declare const i18n: {
650650
region?: string | undefined;
651651
locales: string[];
652652
};
653-
654653
declare function getValueByLocale<T>(defaultValue: T, func: (info: LocaleInfo) => T | undefined): T;
655-
656654
type AddDot<T extends string> = T extends "" ? "" : `.${T}`;
657655
type ValidKey<T> = Exclude<keyof T, symbol>;
658656
type NestedKey<T> = (T extends object ? {
@@ -662,18 +660,17 @@ type AddPrefix<T, P extends string> = {
662660
[K in keyof T as K extends string ? `${P}${K}` : never]: T[K];
663661
};
664662
declare const globalMessages: AddPrefix<{}, "@">;
665-
666663
type GlobalMessageKey = NestedKey<typeof globalMessages>;
667664
type VariableValue = string | number | boolean | Date | React.ReactNode;
668-
669665
declare class Translator<Messages extends object> {
670666
private readonly messages;
671667
readonly language: string;
672668
constructor(fileData: object, filterLocales?: string, locales?: string[]);
673669
trans(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): string;
674-
transToNode(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): ReactNode;
670+
transToNode(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): string | react.ReactElement<any, string | react.JSXElementConstructor<any>> | Iterable<react.ReactNode> | react_jsx_runtime.JSX.Element[];
675671
private getMessage;
672+
private getNestedMessage;
676673
}
677-
declare function getI18nObjects<I18nObjects>(fileData: object, filterLocales?: string): I18nObjects;
674+
declare function getI18nObjects<I18nObjects>(fileData: object, filterLocales?: string): any;
678675

679676
export { AbstractComp, AbstractNode, ActionContextType, ActionExtraInfo, ActionPriority, BroadcastAction, CachedNode, ChangeValueAction, CodeFunction, CodeNode, CodeNodeOptions, CodeType, Comp, CompAction, CompActionTypes, CompConstructor, CompParams, ConstructorToComp, ConstructorToDataType, ConstructorToNodeType, ConstructorToView, CustomAction, DispatchType, EvalMethods, ExecuteQueryAction, ExtraActionType, ExtraNodeType, FetchCheckNode, FetchInfo, FetchInfoOptions, FunctionNode, MultiBaseComp, MultiChangeAction, MultiCompConstructor, Node, NodeToValue, OptionalComp, OptionalNodeType, RecordConstructorToComp, RecordConstructorToView, RecordNode, RecordNodeToValue, RecordOptionalNodeToValue, RelaxedJsonParser, RenameAction, ReplaceCompAction, RouteByNameAction, SimpleAbstractComp, SimpleComp, SimpleCompAction, SimpleNode, Translator, TriggerModuleEventAction, UpdateActionContextAction, UpdateNodesV2Action, ValueAndMsg, WrapContextFn, WrapContextNodeV2, WrapNode, changeChildAction, changeDependName, changeEditDSLAction, changeValueAction, clearMockWindow, clearStyleEval, customAction, deferAction, deleteCompAction, dependingNodeMapEquals, evalFunc, evalFunctionResult, evalNodeOrMinor, evalPerfUtil, evalScript, evalStyle, executeQueryAction, fromRecord, fromUnevaledValue, fromValue, fromValueWithCache, getDynamicStringSegments, getI18nObjects, getValueByLocale, i18n, isBroadcastAction, isChildAction, isCustomAction, isDynamicSegment, isFetching, isMyCustomAction, mergeExtra, multiChangeAction, nodeIsRecord, onlyEvalAction, relaxedJSONToJSON, renameAction, replaceCompAction, routeByNameAction, transformWrapper, triggerModuleEventAction, unwrapChildAction, updateActionContextAction, updateNodesV2Action, withFunction, wrapActionExtraInfo, wrapChildAction, wrapContext, wrapDispatch };

0 commit comments

Comments
 (0)